[neon/qt/qtwebengine/Neon/testing] debian/patches: refresh patches

Jonathan Riddell null at kde.org
Fri Dec 4 12:54:50 GMT 2020 

Git commit 467f0c0d737583a2a533d5d11f4ccfa6cd396846 by Jonathan Riddell.
Committed on 04/12/2020 at 12:54.
Pushed by jriddell into branch 'Neon/testing'.

refresh patches

D  +0    -50   debian/patches/bison-3.7.patch
M  +4    -4    debian/patches/mipsel-link-atomic.patch
D  +0    -19   debian/patches/mipsel-no-dav1d.patch
M  +0    -2    debian/patches/series
M  +13   -13   debian/patches/system-nspr-prtime.patch

https://invent.kde.org/neon/qt/qtwebengine/commit/467f0c0d737583a2a533d5d11f4ccfa6cd396846

diff --git a/debian/patches/bison-3.7.patch b/debian/patches/bison-3.7.patch
deleted file mode 100644
index 3aae8fc..0000000
--- a/debian/patches/bison-3.7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: use .hh extension for Bison header file
- Previously Bison generated an .hh header and rule_bison.py changed it to .h.
- That used to work fine, but with Bison 3.7 the generated .cc file #includes
- that header (instead of duplicating it), so we need to keep the original
- extension.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
- Upstream Chromium fixed this in a different way in
- https://chromium.googlesource.com/chromium/src.git/+/5b8912e6eecb690b.
-Last-Update: 2020-07-28
-
-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.
--outputH = os.path.join(outputDir, inputRoot + '.h')
-+outputH = outputHTmp
- 
- outputHInGen = outputH.replace('gen/', '')
- headerGuard = NameStyleConverter(outputHInGen).to_header_guard()
-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",
--    "$blink_core_output_dir/{{source_name_part}}.h",
-+    "$blink_core_output_dir/{{source_name_part}}.hh",
-   ]
-   args = [
-     "{{source}}",
-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"
- #include "third_party/blink/renderer/core/xml/xpath_path.h"
--#include "third_party/blink/renderer/core/xpath_grammar.h"
-+#include "third_party/blink/renderer/core/xpath_grammar.hh"
- #include "third_party/blink/renderer/platform/bindings/exception_state.h"
- #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
- #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
diff --git a/debian/patches/mipsel-link-atomic.patch b/debian/patches/mipsel-link-atomic.patch
index 0377957..0c359ef 100644
--- a/debian/patches/mipsel-link-atomic.patch
+++ b/debian/patches/mipsel-link-atomic.patch
@@ -13,11 +13,11 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: no
 Last-Update: 2020-03-20
 
-Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
+Index: qtwebengine-everywhere-src-5.15.2/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") {
+--- qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/BUILD.gn
++++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/BUILD.gn
+@@ -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
deleted file mode 100644
index 4ed7511..0000000
--- a/debian/patches/mipsel-no-dav1d.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: disable dav1d support on mipsel
- dav1d does not support MIPS, and there is no config directory for it.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2020-03-17
-
-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"
- }
- 
- declare_args() {
diff --git a/debian/patches/series b/debian/patches/series
index 4adba80..9bfe735 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,5 @@ system-nspr-prtime.patch
 verbose-gn-bootstrap.patch
 mipsel-linux-5.patch
 mipsel-ptrace-include.patch
-mipsel-no-dav1d.patch
 mipsel-link-atomic.patch
-bison-3.7.patch
 sandbox-time64-syscalls.patch
diff --git a/debian/patches/system-nspr-prtime.patch b/debian/patches/system-nspr-prtime.patch
index af03573..dec1803 100644
--- a/debian/patches/system-nspr-prtime.patch
+++ b/debian/patches/system-nspr-prtime.patch
@@ -6,11 +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/
-Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
+Index: qtwebengine-everywhere-src-5.15.2/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") {
+--- qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/BUILD.gn
++++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/BUILD.gn
+@@ -108,6 +108,9 @@ config("base_flags") {
        "-Wglobal-constructors",
      ]
    }
@@ -20,19 +20,19 @@ Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/BUILD.gn
  }
  
  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",
-Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/pr_time_unittest.cc
+     "threading/hang_watcher.cc",
+Index: qtwebengine-everywhere-src-5.15.2/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
+--- qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/time/pr_time_unittest.cc
++++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/time/pr_time_unittest.cc
 @@ -7,7 +7,7 @@
  
  #include "base/compiler_specific.h"
@@ -42,10 +42,10 @@ Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/pr_time
  #include "base/time/time.h"
  #include "build/build_config.h"
  #include "testing/gtest/include/gtest/gtest.h"
-Index: qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/base/time/time.cc
+Index: qtwebengine-everywhere-src-5.15.2/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
+--- qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/time/time.cc
++++ qtwebengine-everywhere-src-5.15.2/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