From 17b08a5491c55b3c44f147572a57e87745886c7282c73c1e5ab04328aa6d1653 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 23 May 2024 08:31:51 +0000 Subject: [PATCH 1/2] Accepting request 1175612 from home:krop:Qt6:Release Qt 6.7.1 OBS-URL: https://build.opensuse.org/request/show/1175612 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-webengine?expand=0&rev=65 --- qt6-webengine.changes | 8 ++++++++ qt6-webengine.spec | 7 +++---- qtwebengine-everywhere-src-6.7.0.tar.xz | 3 --- qtwebengine-everywhere-src-6.7.1.tar.xz | 3 +++ 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 qtwebengine-everywhere-src-6.7.0.tar.xz create mode 100644 qtwebengine-everywhere-src-6.7.1.tar.xz diff --git a/qt6-webengine.changes b/qt6-webengine.changes index 10c7b9b..71ee630 100644 --- a/qt6-webengine.changes +++ b/qt6-webengine.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 21 08:31:53 UTC 2024 - Christophe Marin + +- Update to 6.7.1: + * https://www.qt.io/blog/qt-6.7.1-released +- Drop patch, merged upstream: + * Add-missing-dependencies.patch + ------------------------------------------------------------------- Wed May 15 19:16:46 UTC 2024 - Christoph G diff --git a/qt6-webengine.spec b/qt6-webengine.spec index 9ab97a3..20c7ab6 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -16,7 +16,7 @@ # -%define real_version 6.7.0 +%define real_version 6.7.1 %define short_version 6.7 %define tar_name qtwebengine-everywhere-src %define tar_suffix %{nil} @@ -37,15 +37,14 @@ %bcond_without system_tiff %endif Name: qt6-webengine%{?pkg_suffix} -Version: 6.7.0 +Version: 6.7.1 Release: 0 Summary: Web browser engine for Qt applications License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only 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 +Source0: 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 # diff --git a/qtwebengine-everywhere-src-6.7.0.tar.xz b/qtwebengine-everywhere-src-6.7.0.tar.xz deleted file mode 100644 index c4327d7..0000000 --- a/qtwebengine-everywhere-src-6.7.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a5ba443635dc1f439ab802ac6d761b8def5ebb24e5219bb7289288e72c147de -size 550907592 diff --git a/qtwebengine-everywhere-src-6.7.1.tar.xz b/qtwebengine-everywhere-src-6.7.1.tar.xz new file mode 100644 index 0000000..d0f1227 --- /dev/null +++ b/qtwebengine-everywhere-src-6.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53f08012609a7d949b0e951728ac2364a06466325ffd163b56a87c3fd021dc44 +size 550975920 From ca73d7675f5d621745263a8d5513d9f3854e737a884a192b1f8b0ae657289194 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 23 May 2024 08:51:13 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-webengine?expand=0&rev=66 --- Add-missing-dependencies.patch | 44 ---------------------------------- qt6-webengine.spec | 2 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Add-missing-dependencies.patch diff --git a/Add-missing-dependencies.patch b/Add-missing-dependencies.patch deleted file mode 100644 index 4a90bbb..0000000 --- a/Add-missing-dependencies.patch +++ /dev/null @@ -1,44 +0,0 @@ -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.spec b/qt6-webengine.spec index 20c7ab6..d14d8cd 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package qt6-webengine # # Copyright (c) 2024 SUSE LLC #