[neon/qt/qtwebengine/Neon/testing] debian/patches: refresh patches and remove obsolete ones
Jonathan Riddell
null at kde.org
Fri Oct 23 12:20:06 BST 2020
Git commit 44a1a11b82e2b3173063c9d8cc223fb35e72a5ff by Jonathan Riddell.
Committed on 23/10/2020 at 11:20.
Pushed by jriddell into branch 'Neon/testing'.
refresh patches and remove obsolete ones
M +14 -8 debian/patches/bison-3.7.patch
M +5 -3 debian/patches/mipsel-link-atomic.patch
M +7 -5 debian/patches/mipsel-no-dav1d.patch
M +0 -5 debian/patches/series
M +7 -5 debian/patches/system-lcms2.patch
M +15 -9 debian/patches/system-nspr-prtime.patch
https://invent.kde.org/neon/qt/qtwebengine/commit/44a1a11b82e2b3173063c9d8cc223fb35e72a5ff
diff --git a/debian/patches/bison-3.7.patch b/debian/patches/bison-3.7.patch
index f01cc19..3aae8fc 100644
--- a/debian/patches/bison-3.7.patch
+++ b/debian/patches/bison-3.7.patch
@@ -9,9 +9,11 @@ Forwarded: no
https://chromium.googlesource.com/chromium/src.git/+/5b8912e6eecb690b.
Last-Update: 2020-07-28
---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-@@ -104,7 +104,7 @@ outputHFile.close()
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+@@ -117,7 +117,7 @@ outputHFile.close()
os.unlink(outputHTmp)
# Rewrite the generated header with #include guards.
@@ -20,9 +22,11 @@ Last-Update: 2020-07-28
outputHInGen = outputH.replace('gen/', '')
headerGuard = NameStyleConverter(outputHInGen).to_header_guard()
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
-@@ -952,7 +952,7 @@ action_foreach("make_core_generated_biso
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
+@@ -951,7 +951,7 @@ action_foreach("make_core_generated_biso
]
outputs = [
"$blink_core_output_dir/{{source_name_part}}.cc",
@@ -31,8 +35,10 @@ Last-Update: 2020-07-28
]
args = [
"{{source}}",
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
@@ -31,7 +31,7 @@
#include "third_party/blink/renderer/core/xml/xpath_evaluator.h"
#include "third_party/blink/renderer/core/xml/xpath_ns_resolver.h"
diff --git a/debian/patches/mipsel-link-atomic.patch b/debian/patches/mipsel-link-atomic.patch
index ba2cc6c..0377957 100644
--- a/debian/patches/mipsel-link-atomic.patch
+++ b/debian/patches/mipsel-link-atomic.patch
@@ -13,9 +13,11 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: no
Last-Update: 2020-03-20
---- a/src/3rdparty/chromium/base/BUILD.gn
-+++ b/src/3rdparty/chromium/base/BUILD.gn
-@@ -1266,7 +1266,7 @@ jumbo_component("base") {
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/base/BUILD.gn
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
+@@ -1303,7 +1303,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 f36590d..4ed7511 100644
--- a/debian/patches/mipsel-no-dav1d.patch
+++ b/debian/patches/mipsel-no-dav1d.patch
@@ -4,11 +4,13 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: no
Last-Update: 2020-03-17
---- a/src/3rdparty/chromium/media/media_options.gni
-+++ b/src/3rdparty/chromium/media/media_options.gni
-@@ -89,7 +89,7 @@ declare_args() {
- # are combined and we could override more logging than expected.
- enable_logging_override = !use_jumbo_build && is_chromecast
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/media/media_options.gni
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/media/media_options.gni
++++ qtwebengine-everywhere-src-5.15.1/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)
- enable_dav1d_decoder = !is_android && !is_ios
+ enable_dav1d_decoder = !is_android && !is_ios && target_cpu != "mipsel"
diff --git a/debian/patches/series b/debian/patches/series
index fe7dbc7..bfd116f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,10 @@
#run-unbundling-script.patch
system-lcms2.patch
system-nspr-prtime.patch
-system-icu-utf.patch
verbose-gn-bootstrap.patch
mipsel-linux-5.patch
mipsel-ptrace-include.patch
mipsel-no-dav1d.patch
-mipsel-no-v8-embedded-builtins.patch
mipsel-link-atomic.patch
-icu-67.patch
-openh264-picasm.patch
-gcc-10.patch
bison-3.7.patch
sandbox-time64-syscalls.patch
diff --git a/debian/patches/system-lcms2.patch b/debian/patches/system-lcms2.patch
index 73e88cd..ecf41ae 100644
--- a/debian/patches/system-lcms2.patch
+++ b/debian/patches/system-lcms2.patch
@@ -3,12 +3,14 @@ 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-03-02
+Last-Update: 2018-07-01
---
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
-@@ -259,63 +259,21 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+@@ -258,6 +258,16 @@ if (!pdf_use_skia && !pdf_use_skia_paths
}
}
@@ -25,7 +27,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
config("fx_lcms2_warnings") {
visibility = [ ":*" ]
if (is_clang) {
-@@ -274,48 +284,10 @@
+@@ -273,48 +283,10 @@ config("fx_lcms2_warnings") {
}
source_set("fx_lcms2") {
diff --git a/debian/patches/system-nspr-prtime.patch b/debian/patches/system-nspr-prtime.patch
index e36da93..af03573 100644
--- a/debian/patches/system-nspr-prtime.patch
+++ b/debian/patches/system-nspr-prtime.patch
@@ -6,9 +6,11 @@ Reviewed-by: Sandro Knauß <hefee at debian.org>
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
-@@ -96,6 +96,9 @@ config("base_flags") {
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/base/BUILD.gn
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
+@@ -100,6 +100,9 @@ config("base_flags") {
"-Wglobal-constructors",
]
}
@@ -18,8 +20,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
config("base_implementation") {
-@@ -882,8 +885,6 @@ jumbo_component("base") {
- "third_party/dmg_fp/g_fmt.cc",
+@@ -696,8 +699,6 @@ jumbo_component("base") {
+ "third_party/cityhash/city.h",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
@@ -27,8 +29,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"third_party/superfasthash/superfasthash.c",
"thread_annotations.h",
"threading/platform_thread.cc",
---- a/src/3rdparty/chromium/base/time/pr_time_unittest.cc
-+++ b/src/3rdparty/chromium/base/time/pr_time_unittest.cc
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/pr_time_unittest.cc
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/base/time/pr_time_unittest.cc
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/pr_time_unittest.cc
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
@@ -38,8 +42,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#include "base/time/time.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
---- a/src/3rdparty/chromium/base/time/time.cc
-+++ b/src/3rdparty/chromium/base/time/time.cc
+Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/time.cc
+===================================================================
+--- qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/base/time/time.cc
++++ qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/time.cc
@@ -14,7 +14,7 @@
#include "base/macros.h"
#include "base/no_destructor.h"
More information about the Neon-commits
mailing list