6.10.1
Resolves: RHEL-109197
This commit is contained in:
parent
64d792fd31
commit
c697b2f91d
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
||||
/qtlocation-everywhere-src-6.8.1.tar.xz
|
||||
/qtlocation-everywhere-src-6.9.0.tar.xz
|
||||
/qtlocation-everywhere-src-6.9.1.tar.xz
|
||||
/qtlocation-everywhere-src-6.10.1.tar.xz
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
Summary: Qt6 - Location Libraries
|
||||
Name: qt6-%{qt_module}
|
||||
Version: 6.9.1
|
||||
Version: 6.10.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
# Rest of the licenses are for Qt code in src/location and src/plugins
|
||||
@ -26,6 +26,9 @@ Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/
|
||||
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
|
||||
%endif
|
||||
|
||||
# Upstream patches
|
||||
Patch0: qtlocation-search-for-public-quickshapes-target-instead-of-private.patch
|
||||
|
||||
# filter plugin/qml provides
|
||||
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
|
||||
|
||||
@ -164,6 +167,10 @@ popd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Nov 24 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.1-1
|
||||
- 6.10.1
|
||||
Resolves: RHEL-109197
|
||||
|
||||
* Wed May 14 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.1-1
|
||||
- 6.9.1
|
||||
Resolves: RHEL-78538
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From 79bdc6c286a723981ad021ebffd2f2e57a342057 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Grulich <jgrulich@redhat.com>
|
||||
Date: Wed, 24 Sep 2025 10:39:08 +0200
|
||||
Subject: [PATCH] Location: Search for public QuickShapes target instead of private
|
||||
|
||||
The QuickShapes module in qtdeclarative now provides a public target
|
||||
(`Qt6::QuickShapes`) in addition to its internal one.
|
||||
|
||||
This resolves the module's improper dependency on an internal Qt module,
|
||||
and depending on private API.
|
||||
|
||||
Change-Id: Iebf032f7783068179f641423e518b05fcb7672bd
|
||||
---
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2549a26..87c7865 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@
|
||||
# Need to search for positioning only after we make sure that it's not WASM.
|
||||
# Otherwise we'll get an "QtPositioning not found" error in WASM build.
|
||||
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
|
||||
- Qml Quick Network Test QuickTest Positioning PositioningQuick QuickShapesPrivate
|
||||
+ Qml Quick Network Test QuickTest Positioning PositioningQuick QuickShapes
|
||||
)
|
||||
|
||||
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
|
||||
@@ -48,6 +48,6 @@
|
||||
endforeach()
|
||||
endmacro()
|
||||
|
||||
-assertTargets(Qml Quick Network Test QuickTest Positioning PositioningQuick QuickShapesPrivate)
|
||||
+assertTargets(Qml Quick Network Test QuickTest Positioning PositioningQuick QuickShapes)
|
||||
|
||||
qt_build_repo()
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qtlocation-everywhere-src-6.9.1.tar.xz) = 25b1154608bad6e41556b64d098653157a1b4cd8ee2443af284d93bff4828bb4e5af737933b26d03c05e420837e884555e7676d91ffcf47269b01dc1e744ba49
|
||||
SHA512 (qtlocation-everywhere-src-6.10.1.tar.xz) = e2b0fc3bc68d6a39d56832aba396d9711e7a287970a4a83ad984997e0a9454ac66bd054386d03e3afba8c4c89bdd3486f5b319a2462dc92716d2779074cfc0ac
|
||||
|
||||
Loading…
Reference in New Issue
Block a user