diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index 3cca70f0bdcdc7e424fa9b6a3647b00f0dadcc70..f0a8d1a6bccbdb5ae87ea9cd1e8ed2eb0dfdd56b 100644 --- a/qt5-qtlocation.spec +++ b/qt5-qtlocation.spec @@ -1,32 +1,49 @@ -%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ +%global qt_module qtlocation -Name: qt5-qtlocation -Version: 5.15.2 +Summary: Qt5 - Location component +Name: qt5-%{qt_module} +Version: 5.15.10 Release: 1 -Summary: Qt5 module for Location framework -License: LGPLv2 with exceptions or GPLv3 with exceptions + +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtlocation-everywhere-src-%{version}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz Patch0: qtlocation-gcc10.patch -BuildRequires: make -BuildRequires: qt5-qtbase-devel >= 5.9.0 qt5-qtbase-private-devel pkgconfig(zlib) -BuildRequires: pkgconfig(icu-i18n) pkgconfig(libssl) pkgconfig(libcrypto) qt5-qtdeclarative-devel >= 5.9.0 -%{?_qt5:Requires: %{_qt5} = %{_qt5_version}} +# filter plugin/qml provides +%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ + +BuildRequires: make +BuildRequires: qt5-qtbase-devel >= 5.9.0 +# QtPositioning core-private +BuildRequires: qt5-qtbase-private-devel +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-qtdeclarative-devel >= 5.9.0 + +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libcrypto) %description -The Qt Location API helps you create viable mapping solutions using the -data available from some of the popular location services. +The Qt Location and Qt Positioning APIs gives developers the ability to +determine a position by using a variety of possible sources, including +satellite, or wifi, or text file, and so on. %package devel Summary: Development files provided for qt5-qtlocation Requires: %{name} = %{version}-%{release} qt5-qtbase-devel -Provides: %{name}-examples = %{version}-%{release} -Obsoletes: %{name}-examples < %{version}-%{release} %description devel -This package is a developing files for t5-qtlocation. +%{summary}. + +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + %prep %autosetup -n qtlocation-everywhere-src-%{version} -p1 @@ -39,7 +56,9 @@ This package is a developing files for t5-qtlocation. %install %make_install INSTALL_ROOT=%{buildroot} -cd %{buildroot}%{_qt5_libdir} +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt5_libdir} for prl_file in libQt5*.prl ; do sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} if [ -f "$(basename ${prl_file} .prl).so" ]; then @@ -47,46 +66,54 @@ for prl_file in libQt5*.prl ; do sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} fi done -cd - +popd + -%post -/sbin/ldconfig -%postun -/sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.GPL* LICENSE.LGPL* -%{_qt5_libdir}/{libQt5Location.so.5*,libQt5Positioning.so.5*,libQt5PositioningQuick.so.5*} - +%{_qt5_libdir}/libQt5Location.so.5* %{_qt5_archdatadir}/qml/QtLocation/ -%{_qt5_archdatadir}/qml/QtPositioning/* -%{_qt5_archdatadir}/qml/Qt/labs/location - -%{_qt5_plugindir}/position/ +%{_qt5_libdir}/qt5/qml/Qt/labs/location/* %{_qt5_plugindir}/geoservices/ - -%dir %{_qt5_archdatadir}/qml/Qt -%dir %{_qt5_archdatadir}/qml/Qt/labs +%{_qt5_libdir}/libQt5Positioning.so.5* %dir %{_qt5_archdatadir}/qml/QtPositioning +%{_qt5_archdatadir}/qml/QtPositioning/* +%{_qt5_plugindir}/position/ +%{_qt5_libdir}/libQt5PositioningQuick.so.5* %files devel -%{_qt5_headerdir}/{QtLocation/,QtPositioning/,QtPositioningQuick/} - -%{_qt5_libdir}/{libQt5Location.so,libQt5Location.prl,libQt5Positioning.so} -%{_qt5_libdir}/{libQt5Positioning.prl,libQt5PositioningQuick.so,libQt5PositioningQuick.prl} -%{_qt5_libdir}/pkgconfig/{Qt5Location.pc,Qt5Positioning.pc,Qt5PositioningQuick.pc} - -%dir %{_qt5_libdir}/cmake/{Qt5Location,Qt5Positioning,Qt5PositioningQuick/} - +%{_qt5_headerdir}/QtLocation/ +%{_qt5_libdir}/libQt5Location.so +%{_qt5_libdir}/libQt5Location.prl +%{_qt5_headerdir}/QtPositioning/ +%{_qt5_libdir}/libQt5Positioning.so +%{_qt5_libdir}/libQt5Positioning.prl +%{_qt5_headerdir}/QtPositioningQuick/ +%{_qt5_libdir}/libQt5PositioningQuick.so +%{_qt5_libdir}/libQt5PositioningQuick.prl +%{_qt5_libdir}/pkgconfig/Qt5Location.pc +%dir %{_qt5_libdir}/cmake/Qt5Location %{_qt5_libdir}/cmake/Qt5Location/Qt5Location*.cmake +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_location*.pri +%{_qt5_libdir}/pkgconfig/Qt5Positioning.pc +%dir %{_qt5_libdir}/cmake/Qt5Positioning %{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning*.cmake +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri +%{_qt5_libdir}/pkgconfig/Qt5PositioningQuick.pc +%dir %{_qt5_libdir}/cmake/Qt5PositioningQuick/ %{_qt5_libdir}/cmake/Qt5PositioningQuick/Qt5PositioningQuick*.cmake +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri -%{_qt5_archdatadir}/mkspecs/modules/{qt_lib_location*.pri,qt_lib_positioning*.pri,qt_lib_positioning*.pri} - +%files examples %{_qt5_examplesdir}/ + %changelog +* Wed Aug 23 2023 peijiankang - 5.15.10-1 +- update to upstream version 5.15.10 + * Wed Oct 13 2021 peijiankang - 5.15.2-1 - update to upstream version 5.15.2 diff --git a/qtlocation-everywhere-src-5.15.2.tar.xz b/qtlocation-everywhere-opensource-src-5.15.10.tar.xz similarity index 50% rename from qtlocation-everywhere-src-5.15.2.tar.xz rename to qtlocation-everywhere-opensource-src-5.15.10.tar.xz index a2cb2f8b0a2ee429dea9b11811722fc6f4d1a2f3..762f5537f26673fd3973aa4cd4495535d193c3d8 100644 Binary files a/qtlocation-everywhere-src-5.15.2.tar.xz and b/qtlocation-everywhere-opensource-src-5.15.10.tar.xz differ diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch index 58c84f7c8c784f3cf7fa230b271c7ae0677a4775..fdb96e610d28f3324ca862f0798f55e1caf2157c 100644 --- a/qtlocation-gcc10.patch +++ b/qtlocation-gcc10.patch @@ -10,13 +10,35 @@ index b75d038..b367ee6 100644 namespace mbgl { -diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -index 510ff23..d5e0a92 100644 ---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -@@ -1,4 +1,5 @@ - #include +diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.me qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.me 2023-02-20 14:49:09.397384737 +0100 ++++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp 2023-02-20 14:50:09.654502801 +0100 +@@ -1,5 +1,7 @@ + #pragma once + ++#include ++ + #include + #include + #include +diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.me1 qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.me1 2023-02-20 15:00:23.967862291 +0100 ++++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp 2023-02-20 15:00:41.398058051 +0100 +@@ -4,6 +4,7 @@ + #include + #include + #include +#include + #include - #include + // Polyfill needed by Qt when building for Android with GCC +diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.me qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.me 2023-02-20 15:12:32.276042434 +0100 ++++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp 2023-02-20 15:12:58.578501426 +0100 +@@ -1,5 +1,6 @@ + #pragma once ++#include + #include + + namespace mbgl {