[neon/qt/qtwebengine/Neon/testing] debian: Refresh and rebase other patches.
Dmitry Shachnev
null at kde.org
Wed May 19 11:53:42 BST 2021
Git commit 776c857203cee9c148d930dae1a5410137d6d687 by Dmitry Shachnev.
Committed on 20/11/2020 at 18:11.
Pushed by sitter into branch 'Neon/testing'.
Refresh and rebase other patches.
M +1 -0 debian/changelog
M +2 -2 debian/patches/mipsel-code-range-size.patch
M +1 -1 debian/patches/mipsel-link-atomic.patch
M +4 -4 debian/patches/mipsel-no-dav1d.patch
M +16 -16 debian/patches/system-icu-utf.patch
M +4 -6 debian/patches/system-lcms2.patch
M +4 -4 debian/patches/system-nspr-prtime.patch
https://invent.kde.org/neon/qt/qtwebengine/commit/776c857203cee9c148d930dae1a5410137d6d687
diff --git a/debian/changelog b/debian/changelog
index 364a54f..281df6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtwebengine-opensource-src (5.15.2+dfsg-1) UNRELEASED; urgency=medium
* Drop patches that are included in the new release:
- webrtc-crash.patch
- compile-pdf-examples.patch
+ * Refresh and rebase other patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 20 Nov 2020 20:14:02 +0300
diff --git a/debian/patches/mipsel-code-range-size.patch b/debian/patches/mipsel-code-range-size.patch
index 5c4f1b5..c1985d5 100644
--- a/debian/patches/mipsel-code-range-size.patch
+++ b/debian/patches/mipsel-code-range-size.patch
@@ -6,10 +6,10 @@ Last-Update: 2020-09-28
--- a/src/3rdparty/chromium/v8/src/common/globals.h
+++ b/src/3rdparty/chromium/v8/src/common/globals.h
-@@ -219,7 +219,7 @@ constexpr size_t kMinimumCodeRangeSize = 0 * MB;
+@@ -224,7 +224,7 @@ constexpr size_t kMinimumCodeRangeSize =
constexpr size_t kMinExpectedOSPageSize = 64 * KB; // OS page on PPC Linux
#elif V8_TARGET_ARCH_MIPS
- constexpr bool kRequiresCodeRange = false;
+ constexpr bool kPlatformRequiresCodeRange = false;
-constexpr size_t kMaximalCodeRangeSize = 2048LL * MB;
+constexpr size_t kMaximalCodeRangeSize = 1024LL * MB;
constexpr size_t kMinimumCodeRangeSize = 0 * MB;
diff --git a/debian/patches/mipsel-link-atomic.patch b/debian/patches/mipsel-link-atomic.patch
index 6c6c4c9..e2af7e0 100644
--- a/debian/patches/mipsel-link-atomic.patch
+++ b/debian/patches/mipsel-link-atomic.patch
@@ -15,7 +15,7 @@ Last-Update: 2020-03-20
--- a/src/3rdparty/chromium/base/BUILD.gn
+++ b/src/3rdparty/chromium/base/BUILD.gn
-@@ -1303,7 +1303,7 @@ jumbo_component("base") {
+@@ -1325,7 +1325,7 @@ jumbo_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
diff --git a/debian/patches/mipsel-no-dav1d.patch b/debian/patches/mipsel-no-dav1d.patch
index 2daf844..df3a0ea 100644
--- a/debian/patches/mipsel-no-dav1d.patch
+++ b/debian/patches/mipsel-no-dav1d.patch
@@ -7,11 +7,11 @@ Last-Update: 2020-03-17
--- a/src/3rdparty/chromium/media/media_options.gni
+++ b/src/3rdparty/chromium/media/media_options.gni
@@ -93,7 +93,7 @@ declare_args() {
- # playback quality.
- enable_logging_override = !use_jumbo_build && (is_chromecast || is_fuchsia)
+ # are combined and we could override more logging than expected.
+ enable_logging_override = !use_jumbo_build && is_chromecast
- enable_dav1d_decoder = !is_android && !is_ios
+ enable_dav1d_decoder = !is_android && !is_ios && target_cpu != "mipsel"
- }
- declare_args() {
+ # Enable browser managed persistent metadata storage for EME persistent
+ # session and persistent usage record session.
diff --git a/debian/patches/system-icu-utf.patch b/debian/patches/system-icu-utf.patch
index cbb4160..aecfadb 100644
--- a/debian/patches/system-icu-utf.patch
+++ b/debian/patches/system-icu-utf.patch
@@ -11,7 +11,7 @@ Last-Update: 2020-09-08
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/3rdparty/chromium/base/BUILD.gn
+++ b/src/3rdparty/chromium/base/BUILD.gn
-@@ -102,6 +102,7 @@ config("base_flags") {
+@@ -110,6 +110,7 @@ config("base_flags") {
}
ldflags = [
"-lnspr4",
@@ -19,16 +19,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
]
}
-@@ -697,8 +698,6 @@ jumbo_component("base") {
- "test/spin_wait.h",
- "third_party/cityhash/city.cc",
+@@ -714,8 +715,6 @@ jumbo_component("base") {
"third_party/cityhash/city.h",
+ "third_party/cityhash_v103/src/city_v103.cc",
+ "third_party/cityhash_v103/src/city_v103.h",
- "third_party/icu/icu_utf.cc",
- "third_party/icu/icu_utf.h",
"third_party/superfasthash/superfasthash.c",
"thread_annotations.h",
- "threading/platform_thread.cc",
-@@ -1283,6 +1282,7 @@ jumbo_component("base") {
+ "threading/hang_watcher.cc",
+@@ -1305,6 +1304,7 @@ jumbo_component("base") {
"//base/third_party/dynamic_annotations",
"//build:branding_buildflags",
"//third_party/modp_b64",
@@ -38,7 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
public_deps = [
--- a/src/3rdparty/chromium/base/files/file_path.cc
+++ b/src/3rdparty/chromium/base/files/file_path.cc
-@@ -18,7 +18,7 @@
+@@ -19,7 +19,7 @@
#if defined(OS_MACOSX)
#include "base/mac/scoped_cftyperef.h"
@@ -47,7 +47,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#endif
#if defined(OS_WIN)
-@@ -1185,9 +1185,9 @@ inline int HFSReadNextNonIgnorableCodepo
+@@ -1183,9 +1183,9 @@ inline int HFSReadNextNonIgnorableCodepo
int* index) {
int codepoint = 0;
while (*index < length && codepoint == 0) {
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#include "base/values.h"
namespace base {
-@@ -551,10 +551,10 @@ bool JSONParser::DecodeUTF16(uint32_t* o
+@@ -565,10 +565,10 @@ bool JSONParser::DecodeUTF16(uint32_t* o
// If this is a high surrogate, consume the next code unit to get the
// low surrogate.
@@ -83,8 +83,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return false;
// Make sure that the token has more characters to consume the
-@@ -574,7 +574,7 @@ bool JSONParser::DecodeUTF16(uint32_t* o
- if (!HexStringToInt(*escape_sequence, &code_unit16_low))
+@@ -588,7 +588,7 @@ bool JSONParser::DecodeUTF16(uint32_t* o
+ if (!UnprefixedHexStringToInt(*escape_sequence, &code_unit16_low))
return false;
- if (!CBU16_IS_TRAIL(code_unit16_low)) {
@@ -92,7 +92,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if ((options_ & JSON_REPLACE_INVALID_CHARACTERS) == 0)
return false;
*out_code_point = kUnicodeReplacementPoint;
-@@ -582,12 +582,12 @@ bool JSONParser::DecodeUTF16(uint32_t* o
+@@ -596,12 +596,12 @@ bool JSONParser::DecodeUTF16(uint32_t* o
}
uint32_t code_point =
@@ -206,7 +206,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#include "build/build_config.h"
namespace base {
-@@ -342,19 +342,19 @@ void TruncateUTF8ToByteSize(const std::s
+@@ -327,19 +327,19 @@ void TruncateUTF8ToByteSize(const std::s
}
DCHECK_LE(byte_size,
static_cast<uint32_t>(std::numeric_limits<int32_t>::max()));
@@ -230,7 +230,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (!IsValidCharacter(code_point) ||
!IsValidCodepoint(code_point)) {
char_index = prev - 1;
-@@ -513,7 +513,7 @@ inline static bool DoIsStringUTF8(String
+@@ -498,7 +498,7 @@ inline static bool DoIsStringUTF8(String
while (char_index < src_len) {
int32_t code_point;
@@ -377,7 +377,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/3rdparty/chromium/components/download/internal/common/download_path_reservation_tracker.cc
+++ b/src/3rdparty/chromium/components/download/internal/common/download_path_reservation_tracker.cc
@@ -23,7 +23,7 @@
- #include "base/task/lazy_task_runner.h"
+ #include "base/task/lazy_thread_pool_task_runner.h"
#include "base/task/post_task.h"
#include "base/task_runner_util.h"
-#include "base/third_party/icu/icu_utf.h"
@@ -409,7 +409,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+++ b/src/3rdparty/chromium/content/browser/devtools/devtools_stream_file.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_util.h"
- #include "base/task/lazy_task_runner.h"
+ #include "base/task/lazy_thread_pool_task_runner.h"
#include "base/task/post_task.h"
-#include "base/third_party/icu/icu_utf.h"
+#include <unicode/utf.h>
diff --git a/debian/patches/system-lcms2.patch b/debian/patches/system-lcms2.patch
index a6e1b61..25dec87 100644
--- a/debian/patches/system-lcms2.patch
+++ b/debian/patches/system-lcms2.patch
@@ -3,12 +3,12 @@ Author: Sandro Knauß <hefee at debian.org>
Origin: Debian
Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
Reviewed-by: Sandro Knauß <hefee at debian.org>
-Last-Update: 2020-09-10
+Last-Update: 2020-11-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-@@ -258,63 +258,21 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+@@ -256,61 +256,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
}
}
@@ -73,10 +73,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- "lcms/src/cmswtpnt.c",
- "lcms/src/cmsxform.c",
- ]
- deps = [
-- "../core/fxcrt",
-+ ":lcms2_shim",
- ]
+- deps = [ "../core/fxcrt" ]
++ deps = [ ":lcms2_shim" ]
+ libs = ["lcms2"]
}
diff --git a/debian/patches/system-nspr-prtime.patch b/debian/patches/system-nspr-prtime.patch
index 102c635..3f6d06a 100644
--- a/debian/patches/system-nspr-prtime.patch
+++ b/debian/patches/system-nspr-prtime.patch
@@ -8,7 +8,7 @@ Last-Update: 2020-03-02
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/3rdparty/chromium/base/BUILD.gn
+++ b/src/3rdparty/chromium/base/BUILD.gn
-@@ -100,6 +100,9 @@ config("base_flags") {
+@@ -108,6 +108,9 @@ config("base_flags") {
"-Wglobal-constructors",
]
}
@@ -18,15 +18,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
config("base_implementation") {
-@@ -696,8 +699,6 @@ jumbo_component("base") {
- "third_party/cityhash/city.h",
+@@ -713,8 +716,6 @@ jumbo_component("base") {
+ "third_party/cityhash_v103/src/city_v103.h",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"thread_annotations.h",
- "threading/platform_thread.cc",
+ "threading/hang_watcher.cc",
--- a/src/3rdparty/chromium/base/time/pr_time_unittest.cc
+++ b/src/3rdparty/chromium/base/time/pr_time_unittest.cc
@@ -7,7 +7,7 @@
More information about the Neon-commits
mailing list