From 64343635a4d1f6a64dc1c5f966cd2a9455e58dd9 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 28 Sep 2024 18:40:37 +0000
Subject: [PATCH] extra/qt6-webengine to 6.7.3-1

---
 extra/qt6-webengine/.SRCINFO                  | 10 +++----
 extra/qt6-webengine/PKGBUILD                  | 10 ++-----
 .../qtwebengine-6.7.0-ninja1.12.patch         | 30 -------------------
 3 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 extra/qt6-webengine/qtwebengine-6.7.0-ninja1.12.patch

diff --git a/extra/qt6-webengine/.SRCINFO b/extra/qt6-webengine/.SRCINFO
index 0c730d7ed..ca8558fb4 100644
--- a/extra/qt6-webengine/.SRCINFO
+++ b/extra/qt6-webengine/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qt6-webengine
 	pkgdesc = Provides support for web applications using the Chromium browser project
-	pkgver = 6.7.2
-	pkgrel = 3
+	pkgver = 6.7.3
+	pkgrel = 1
 	url = https://www.qt.io
 	arch = x86_64
 	groups = qt6
@@ -66,13 +66,11 @@ pkgbase = qt6-webengine
 	depends = ttf-font
 	depends = zlib
 	optdepends = pipewire: WebRTC desktop sharing under Wayland
-	source = git+https://code.qt.io/qt/qtwebengine#tag=v6.7.2
+	source = git+https://code.qt.io/qt/qtwebengine#tag=v6.7.3
 	source = git+https://code.qt.io/qt/qtwebengine-chromium
-	source = qtwebengine-6.7.0-ninja1.12.patch
 	source = qtwebengine-ffmpeg-7.patch
-	sha256sums = e4ea371bbe91763e0499b7d12166b43162f29e57ba81705870a0f8c4ba784408
+	sha256sums = 31c13b702b6ebd9aba04c751dedb6d6d301adf74ab0efd13192b482a6786485a
 	sha256sums = SKIP
-	sha256sums = c037cccc1d43bcd9d67045354ca48b405acec217149cb4b2bd3cfb7b5561cc33
 	sha256sums = f108c916ab87a247571255c56f9d04fc9bccdc3fe8972bf5a60d29636c6f5c3e
 
 pkgname = qt6-webengine
diff --git a/extra/qt6-webengine/PKGBUILD b/extra/qt6-webengine/PKGBUILD
index 4d6908ebb..f79e44326 100644
--- a/extra/qt6-webengine/PKGBUILD
+++ b/extra/qt6-webengine/PKGBUILD
@@ -9,8 +9,8 @@
 highmem=1
 
 pkgname=qt6-webengine
-pkgver=6.7.2
-pkgrel=3
+pkgver=6.7.3
+pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -78,13 +78,11 @@ groups=(qt6)
 _pkgfn=${pkgname/6-/}
 source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$pkgver
         git+https://code.qt.io/qt/qtwebengine-chromium
-        qtwebengine-6.7.0-ninja1.12.patch
         qtwebengine-ffmpeg-7.patch
         0001-ARM-toolchain-fixes.patch
         0002-Run-blink-bindings-generation-single-threaded.patch)
-sha256sums=('e4ea371bbe91763e0499b7d12166b43162f29e57ba81705870a0f8c4ba784408'
+sha256sums=('31c13b702b6ebd9aba04c751dedb6d6d301adf74ab0efd13192b482a6786485a'
             'SKIP'
-            'c037cccc1d43bcd9d67045354ca48b405acec217149cb4b2bd3cfb7b5561cc33'
             'f108c916ab87a247571255c56f9d04fc9bccdc3fe8972bf5a60d29636c6f5c3e'
             '772aeba76d16387e28ef629285965109a4bfaa02ca2dd466e9526fe2030773ec'
             'eff4ebf2e714185ef6e36e30c8d2158da6b41a46e3168d06472d35f6c9977aaf')
@@ -95,8 +93,6 @@ prepare() {
   git submodule set-url src/3rdparty "$srcdir"/qtwebengine-chromium
   git -c protocol.file.allow=always submodule update
 
-# Fix build with ninja 1.12 - Gentoo patch
-  patch -p1 -i ../qtwebengine-6.7.0-ninja1.12.patch
 # Fix build with ffmpeg 7 - Chromium patches
   patch -d src/3rdparty/chromium -p1 -i "$srcdir"/qtwebengine-ffmpeg-7.patch
 
diff --git a/extra/qt6-webengine/qtwebengine-6.7.0-ninja1.12.patch b/extra/qt6-webengine/qtwebengine-6.7.0-ninja1.12.patch
deleted file mode 100644
index 2d12daccd..000000000
--- a/extra/qt6-webengine/qtwebengine-6.7.0-ninja1.12.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Patch status: pending being looked at upstream
-
-Issue[1][2][3] also exist in chromium itself[4], and unclear
-why this started happening only with ninja-1.12.0 at the moment.
-
-Just a quickfix, likely not fully correct and seems there may
-be further unresolved race issues.
-
-[1] https://bugs.gentoo.org/930107
-[2] https://bugreports.qt.io/browse/QTBUG-124375
-[3] https://github.com/ninja-build/ninja/issues/2417
-[4] https://bugs.gentoo.org/930112
---- a/src/3rdparty/chromium/content/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -198,2 +198,3 @@
-     "//components/services/storage/public/mojom",
-+    "//components/spellcheck:buildflags",
-     "//components/sqlite_proto",
---- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
-+++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
-@@ -22,2 +22,3 @@
-     "//content/public/browser",
-+    "//components/web_cache/public/mojom",
-     "//extensions/common",
---- a/src/core/configure/BUILD.root.gn.in
-+++ b/src/core/configure/BUILD.root.gn.in
-@@ -235,2 +235,3 @@
-   deps = [
-+    "//chrome/app:generated_resources",
-     "//components/zoom",