diff --git a/0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch b/0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch deleted file mode 100644 index c42fb93..0000000 --- a/0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch +++ /dev/null @@ -1,42 +0,0 @@ -From eff776c676b042bd75604105a3876f999b9808d5 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann -Date: Mon, 23 Dec 2024 12:47:21 +0100 -Subject: [PATCH] CMake: Fix find_package call in Qt6QmlFindQmlscInternal.cmake - -Qt6QmlFindQmlscInternal.cmake tries to find the -Qt6QmlCompilerPlusPrivateTools package and specifies a version. That -version was PROJECT_VERSION, which is the version of the user project. -It should be the Qt's version instead. - -Read the package version of the Qt6::Qml target and use that in the -find_package call. The target is guaranteed to exist, because the -Qt6QmlFindQmlscInternal.cmake inclusion is guarded by a check for this -target. - -This amends commit b0f1ec4e394dcee82400964225be485a7cdd3c53. - -Pick-to: 6.8 6.9 -Fixes: QTBUG-132421 -Change-Id: I04402296b351ef8df991ade697c633594b0b17b5 -Reviewed-by: Alexey Edelev ---- - src/qml/Qt6QmlFindQmlscInternal.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/qml/Qt6QmlFindQmlscInternal.cmake b/src/qml/Qt6QmlFindQmlscInternal.cmake -index f02103f45f..3f549c7cbe 100644 ---- a/src/qml/Qt6QmlFindQmlscInternal.cmake -+++ b/src/qml/Qt6QmlFindQmlscInternal.cmake -@@ -30,7 +30,8 @@ endif() - - # This can't use the find_package(Qt6 COMPONENTS) signature, because Qt6Config uses NO_DEFAULT and - # won't look at the prepended extra find root paths. --find_package(Qt6QmlCompilerPlusPrivateTools ${PROJECT_VERSION} QUIET CONFIG -+get_target_property(_qt_qml_package_version Qt6::Qml _qt_package_version) -+find_package(Qt6QmlCompilerPlusPrivateTools ${_qt_qml_package_version} QUIET CONFIG - PATHS - ${_qt_additional_host_packages_prefix_paths} - ) --- -2.47.1 - diff --git a/qt6-declarative.changes b/qt6-declarative.changes index 0835d38..7bd857d 100644 --- a/qt6-declarative.changes +++ b/qt6-declarative.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 31 10:22:53 UTC 2025 - Christophe Marin + +- Update to 6.8.2 + https://www.qt.io/blog/qt-6.8.2-released +- Drop patch, merged upstream: + * 0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch + ------------------------------------------------------------------- Sat Jan 18 15:34:27 UTC 2025 - Christophe Marin diff --git a/qt6-declarative.spec b/qt6-declarative.spec index f9eba04..c876186 100644 --- a/qt6-declarative.spec +++ b/qt6-declarative.spec @@ -16,7 +16,7 @@ # -%define real_version 6.8.1 +%define real_version 6.8.2 %define short_version 6.8 %define tar_name qtdeclarative-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-declarative%{?pkg_suffix} -Version: 6.8.1 +Version: 6.8.2 Release: 0 Summary: Qt 6 Declarative Libraries and tools License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only @@ -36,8 +36,6 @@ Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{r Source99: qt6-declarative-rpmlintrc # PATCH-FIX-OPENSUSE Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch BuildRequires: memory-constraints BuildRequires: pkgconfig BuildRequires: python3-base @@ -428,6 +426,7 @@ ABI or API guarantees. ### Private only libraries ### + %package -n libQt6LabsPlatform6 Summary: Qt 6 LabsPlatform library License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only @@ -877,6 +876,7 @@ This library does not have any ABI or API guarantees. ### Static libraries ### + %package -n qt6-packetprotocol-devel-static Summary: Qt6 PacketProtocol static library License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only diff --git a/qtdeclarative-everywhere-src-6.8.1.tar.xz b/qtdeclarative-everywhere-src-6.8.1.tar.xz deleted file mode 100644 index 771d04f..0000000 --- a/qtdeclarative-everywhere-src-6.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc -size 36463572 diff --git a/qtdeclarative-everywhere-src-6.8.2.tar.xz b/qtdeclarative-everywhere-src-6.8.2.tar.xz new file mode 100644 index 0000000..f060b4d --- /dev/null +++ b/qtdeclarative-everywhere-src-6.8.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:144d876adc8bb55909735143e678d1e24eadcd0a380a0186792d88b731346d56 +size 36485320