From 098a6c9472ac239572bc9b9337f0eff9924e028973ee119cd6b38da15a6c74ec Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Fri, 17 May 2024 16:47:42 +0000 Subject: [PATCH] Accepting request 1174917 from home:mathletic:branches:KDE:Qt:5.15 - Backport Ninja 1.12 compatibility patch (and adjust paths) Add-missing-dependencies.patch from upstream OBS-URL: https://build.opensuse.org/request/show/1174917 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=63 --- Add-missing-dependencies.patch | 12 ++++++++++++ libqt5-qtwebengine.changes | 6 ++++++ libqt5-qtwebengine.spec | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Add-missing-dependencies.patch diff --git a/Add-missing-dependencies.patch b/Add-missing-dependencies.patch new file mode 100644 index 0000000..afce4f4 --- /dev/null +++ b/Add-missing-dependencies.patch @@ -0,0 +1,12 @@ +diff --git a/chromium/content/public/browser/BUILD.gn b/chromium/content/public/browser/BUILD.gn +index 7cf82a4aacf..0e0dda2c3ca 100644 +--- 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", diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 1f2b381..467b688 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 17 05:53:59 UTC 2024 - Christoph G + +- Backport Ninja 1.12 compatibility patch (and adjust paths) + Add-missing-dependencies.patch from upstream + ------------------------------------------------------------------- Fri Apr 19 14:57:37 UTC 2024 - Christophe Marin diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 2e08e73..090ea89 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebengine # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -64,6 +64,8 @@ Patch6: sandbox_futex_time64.patch Patch7: python311-fixes.patch # PATCH-FIX-UPSTREAM -- libxml 2.12 support Patch8: 0001-Fix-building-with-system-libxml2.patch +# PATCH-FIX-UPSTREAM -- Add missing dependencies for compatibility with Ninja 1.12 +Patch9: Add-missing-dependencies.patch ### Patch 50-99 are applied conditionally # PATCH-FIX-OPENSUSE -- allow building qtwebengine with ffmpeg5 Patch50: qtwebengine-ffmpeg5.patch @@ -300,6 +302,7 @@ Examples for the libqt5-qtpdf module. %patch -P6 -p1 %patch -P7 -p1 %patch -P8 -p1 +%patch -P9 -p1 # Replace the whole catapult folder rather than picking individual changes pushd src/3rdparty/chromium/third_party