Accepting request 1242045 from KDE:Qt6

Qt 6.8.2 + pyside (forwarded request 1241751 from krop)

OBS-URL: https://build.opensuse.org/request/show/1242045
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-declarative?expand=0&rev=48

0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch

@@ -1,42 +0,0 @@
-From eff776c676b042bd75604105a3876f999b9808d5 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-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 <alexey.edelev@qt.io>
----
- 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
-

qt6-declarative.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 31 10:22:53 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- 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 <christophe@krop.fr>
 

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