[neon/qt/qtwebengine/Neon/release_jammy] debian: Build with Ninja 1.12.

[Soren Stoutner]

Git commit c6983346749be14a23cb7641ae917866cec677ff by Soren Stoutner.
Committed on 22/05/2024 at 19:22.
Pushed by jriddell into branch 'Neon/release_jammy'.

Build with Ninja 1.12.

M  +2    -1    debian/changelog
A  +47   -0    debian/patches/ninja-1.12.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtwebengine/-/commit/c6983346749be14a23cb7641ae917866cec677ff

diff --git a/debian/changelog b/debian/changelog
index d209d9b..2c82e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ qtwebengine-opensource-src (5.15.16+dfsg-5) unstable; urgency=medium
 
   * Add a patch from Arch Linux to build using C++17, which is required by ICU
     75.
+  * Cherry-pick upstream patches to build with Ninja 1.12.
 
- -- Soren Stoutner <soren at debian.org>  Tue, 21 May 2024 22:32:06 -0700
+ -- Soren Stoutner <soren at debian.org>  Wed, 22 May 2024 10:19:43 -0700
 
 qtwebengine-opensource-src (5.15.16+dfsg-4) unstable; urgency=medium
 
diff --git a/debian/patches/ninja-1.12.patch b/debian/patches/ninja-1.12.patch
new file mode 100644
index 0000000..df2b1b2
--- /dev/null
+++ b/debian/patches/ninja-1.12.patch
@@ -0,0 +1,47 @@
+Description: Build with Ninja 1.12.
+Author: Soren Stoutner <soren at debian.org>
+Forwarded: Cherry-picked from upstream.
+Origin: upstream, https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/555586
+Origin: upstream, https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560295
+Last-Update: 2024-05-22
+
+--- a/src/3rdparty/chromium/content/public/browser/BUILD.gn
++++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn
+@@ -469,6 +469,7 @@ jumbo_source_set("browser_sources") {
+     "//build:chromeos_buildflags",
+     "//cc",
+     "//components/viz/host",
++    "//components/spellcheck:buildflags",
+     "//content/browser",  # Must not be public_deps!
+     "//device/fido",
+     "//gpu",
+--- a/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
++++ b/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
+@@ -105,6 +105,7 @@ static_library("browser") {
+     "//components/keyed_service/core",
+     "//components/prefs",
+     "//components/query_parser",
++    "//components/signin/public/base:signin_buildflags",
+     "//components/signin/public/identity_manager",
+     "//components/sync",
+     "//components/url_formatter",
+--- a/src/3rdparty/chromium/components/webcrypto/BUILD.gn
++++ b/src/3rdparty/chromium/components/webcrypto/BUILD.gn
+@@ -62,6 +62,7 @@ static_library("webcrypto") {
+     "//crypto",
+     "//crypto:platform",
+     "//third_party/blink/public:blink_headers",
++    "//third_party/blink/renderer/platform/heap:heap",
+   ]
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/BUILD.gn
+@@ -121,6 +121,7 @@ blink_platform_sources("heap") {
+   }
+ 
+   visibility = [
++    "//components/webcrypto:webcrypto",
+     "//third_party/blink/renderer/platform:platform",
+     "//third_party/blink/renderer/platform/instrumentation:instrumentation",
+     "//third_party/blink/renderer/platform/loader:loader",
diff --git a/debian/patches/series b/debian/patches/series
index 660030b..d0c1a9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ ffmpeg-x86-optimization.patch
 fix-example-pro-files.patch
 icu74.patch
 build-with-c++17.patch
+ninja-1.12.patch