diff --git a/Add-missing-dependencies.patch b/Add-missing-dependencies.patch new file mode 100644 index 0000000..4a90bbb --- /dev/null +++ b/Add-missing-dependencies.patch @@ -0,0 +1,44 @@ +From a766045f65f934df3b5f1aa63bc86fbb3e003a09 Mon Sep 17 00:00:00 2001 +From: Anu Aliyas +Date: Wed, 17 Apr 2024 12:35:58 +0200 +Subject: Add missing dependencies to avoid compilation errors + +Missing dependencies are added to resolve the dependencies issues +encountered when compiling with Ninja 1.12.0 + +Fixes:QTBUG-124375 +Change-Id: I0f23ef6c60a6f01ee11bffd46121fd7f98dc022c +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/555586 +Reviewed-by: Michal Klocek +--- + chromium/content/public/browser/BUILD.gn | 1 + + chromium/extensions/browser/api/declarative_net_request/BUILD.gn | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/3rdparty/chromium/content/public/browser/BUILD.gn b/src/3rdparty/chromium/content/public/browser/BUILD.gn +index d38fa8d303a..c5813115e88 100644 +--- a/src/3rdparty/chromium/content/public/browser/BUILD.gn ++++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn +@@ -539,6 +539,7 @@ jumbo_source_set("browser_sources") { + "//cc", + "//components/services/storage/public/cpp", + "//components/viz/host", ++ "//components/spellcheck:buildflags", + "//content/browser", # Must not be public_deps! + "//device/fido", + "//gpu", +diff --git a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn +index 1fc492f5a0c..13a266e22f1 100644 +--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn ++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn +@@ -23,6 +23,7 @@ source_set("declarative_net_request") { + "//extensions/common", + "//extensions/common/api", + "//services/preferences/public/cpp", ++ "//components/web_cache/browser", + ] + + public_deps = [ "//extensions/browser:browser_sources" ] +-- +2.45.0 + diff --git a/qt6-webengine.changes b/qt6-webengine.changes index 89df6cd..10c7b9b 100644 --- a/qt6-webengine.changes +++ b/qt6-webengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 15 19:16:46 UTC 2024 - Christoph G + +- Backport Ninja 1.12 compatibility patch (and adjust paths) + Add-missing-dependencies.patch from upstream + ------------------------------------------------------------------- Tue Apr 2 13:40:04 UTC 2024 - Christophe Marin diff --git a/qt6-webengine.spec b/qt6-webengine.spec index 97e41c1..9ab97a3 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -1,7 +1,7 @@ # # spec file # -# 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 @@ -45,6 +45,7 @@ URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-webengine-rpmlintrc # Patches 0-100 are upstream patches # +Patch001: Add-missing-dependencies.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: rtc-dont-use-h264.patch #