diff --git a/0001-Fix-appendChildNode-call.patch b/0001-Fix-appendChildNode-call.patch index 1ac76297ff169ca2c482dcfa5826d6ae58437c07..0e27bf7ccd2499b776b271ea11e522eb08752703 100644 --- a/0001-Fix-appendChildNode-call.patch +++ b/0001-Fix-appendChildNode-call.patch @@ -1,4 +1,4 @@ -From 76e86dc9ff08a8bcf4c94014933cc1f362cd36b1 Mon Sep 17 00:00:00 2001 +From 507262f36e7cf54a9c0d679c1f9b64f87dbc8772 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Tue, 22 Mar 2022 22:42:58 +0000 Subject: [PATCH 1/7] Fix appendChildNode() call diff --git a/0005-Fix-build-of-Qt.labs.location-QML-plugin.patch b/0005-Fix-build-of-Qt.labs.location-QML-plugin.patch index 2c37dc1ec6b79c3a3b07f02339dc34d6baa86d05..3244e6cf6b56ac5a8e7e918622571e13b302890a 100644 --- a/0005-Fix-build-of-Qt.labs.location-QML-plugin.patch +++ b/0005-Fix-build-of-Qt.labs.location-QML-plugin.patch @@ -1,4 +1,4 @@ -From 0359efc82f0330f801b6771db88bf84896392823 Mon Sep 17 00:00:00 2001 +From 55dda14723302d4de7373c2d0f1c656f786a8ae6 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Thu, 17 Mar 2022 18:40:27 +0100 Subject: [PATCH 5/7] Fix build of Qt.labs.location QML plugin diff --git a/0006-Fix-HereMap-plugin-not-supporting-authentication-via.patch b/0006-Fix-HereMap-plugin-not-supporting-authentication-via.patch index b8b7ae45061e00130087473a86d80d1aa793dcc8..691bbc5504f91ecf130466e1bebdee535cd3b01a 100644 --- a/0006-Fix-HereMap-plugin-not-supporting-authentication-via.patch +++ b/0006-Fix-HereMap-plugin-not-supporting-authentication-via.patch @@ -1,4 +1,4 @@ -From 2a46effe1ef9302e3dfa33700ef95863baa91c35 Mon Sep 17 00:00:00 2001 +From 90704aa256381d67a38bd42d62b1b43eae51ad94 Mon Sep 17 00:00:00 2001 From: Lorenzo Lucignano Date: Mon, 23 Oct 2023 09:50:49 +0200 Subject: [PATCH 6/7] Fix HereMap plugin not supporting authentication via @@ -224,13 +224,13 @@ index d07a93ba..4cfd62f8 100644 } -QString QGeoTileFetcherNokia::token() const -+QString QGeoTileFetcherNokia::apiKey() const - { +-{ - return m_token; -} - -QString QGeoTileFetcherNokia::applicationId() const --{ ++QString QGeoTileFetcherNokia::apiKey() const + { - return m_applicationId; + return m_apiKey; } diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index 4002b35a67c8a057ea6fc4ee88e8fa12fc4efa27..39d122ef29aaba5fdffec78bd25ab974987c0f29 100644 --- a/qt5-qtlocation.spec +++ b/qt5-qtlocation.spec @@ -2,21 +2,20 @@ Summary: Qt5 - Location component Name: qt5-%{qt_module} -Version: 5.15.16 +Version: 5.15.18 Release: 1 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: https://www.qt.io -%global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz +Source0: https://download.qt.io/archive/qt/%{version_major_minor}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz ## upstream patches ## repo: https://invent.kde.org/qt/qt/qtlocation ## branch: kde/5.15 -## git format-patch v5.15.16-lts-lgpl -Patch1: 0001-Fix-appendChildNode-call.patch -Patch5: 0005-Fix-build-of-Qt.labs.location-QML-plugin.patch -Patch6: 0006-Fix-HereMap-plugin-not-supporting-authentication-via.patch +## git format-patch v5.15.18-lts-lgpl +Patch1: 0001-Fix-appendChildNode-call.patch +Patch5: 0005-Fix-build-of-Qt.labs.location-QML-plugin.patch +Patch6: 0006-Fix-HereMap-plugin-not-supporting-authentication-via.patch Patch100: 0100-Add-some-missing-cstdint-inclusions-872.patch Patch101: 0101-Add-missing-include.patch @@ -28,12 +27,12 @@ Patch104: 0104-Fix-build-with-ICU-75.patch %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ BuildRequires: make -BuildRequires: qt5-qtbase-devel >= 5.9.0 +BuildRequires: qt5-qtbase-devel >= %{version} # QtPositioning core-private BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -BuildRequires: qt5-qtdeclarative-devel >= 5.9.0 - +BuildRequires: qt5-qtdeclarative-devel >= %{version} +BuildRequires: qt5-doctools BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libssl) @@ -57,17 +56,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description examples %{summary}. +%package doc +Summary: Documentation for %{name} +Buildarch: noarch + +%description doc +%{summary}. %prep %autosetup -n qtlocation-everywhere-src-%{version} -p1 %build %{qmake_qt5} - %qmake_qt5_build +%qmake_qt5_build docs %install %qmake_qt5_install +%qmake_qt5_install install_docs ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs @@ -118,8 +124,14 @@ popd %files examples %{_qt5_examplesdir}/ +%files doc +%license LICENSE.FDL +%{_qt5_docdir}/* %changelog +* Sun Nov 02 2025 Funda Wang - 5.15.18-1 +- update to 5.15.18 + * Thu Apr 10 2025 Funda Wang - 5.15.16-1 - update to 5.15.16 diff --git a/qtlocation-everywhere-opensource-src-5.15.16.tar.xz b/qtlocation-everywhere-opensource-src-5.15.18.tar.xz similarity index 32% rename from qtlocation-everywhere-opensource-src-5.15.16.tar.xz rename to qtlocation-everywhere-opensource-src-5.15.18.tar.xz index ef29a69a0fc30d751a6599e0caee39611d45325b..7515d1b9d45a0cceffdfcda5cd2284f95100edaa 100644 --- a/qtlocation-everywhere-opensource-src-5.15.16.tar.xz +++ b/qtlocation-everywhere-opensource-src-5.15.18.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33061c9b3ebab673d0ac6b1e014b7b139c9ec9fa6049c05c711487de69b65c87 -size 6548480 +oid sha256:ea2ed52b085989fe38d0e7f9080da4104d4707d60d8d3b5f5a478b9bec325a3c +size 6534556