5.9.6

5.9.4
2018-06-12 09:37:29 -05:00 · 2018-01-24 10:58:08 -06:00
5 changed files with 39 additions and 142 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1,5 @@
-/qtlocation-everywhere-src-5.10.1.tar.xz
-/qtlocation-everywhere-src-5.11.0.tar.xz
-/qtlocation-everywhere-src-5.11.1.tar.xz
-/qtlocation-everywhere-src-5.11.2.tar.xz
-/qtlocation-everywhere-src-5.11.3.tar.xz
-/qtlocation-everywhere-src-5.12.1.tar.xz
-/qtlocation-everywhere-src-5.12.3.tar.xz
-/qtlocation-everywhere-src-5.12.4.tar.xz
-/qtlocation-everywhere-src-5.12.5.tar.xz
-/qtlocation-everywhere-src-5.13.2.tar.xz
+/qtlocation-opensource-src-5.9.1.tar.xz
+/qtlocation-opensource-src-5.9.2.tar.xz
+/qtlocation-opensource-src-5.9.3.tar.xz
+/qtlocation-opensource-src-5.9.4.tar.xz
+/qtlocation-opensource-src-5.9.6.tar.xz
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@ -2,25 +2,21 @@

 Summary: Qt5 - Location component
 Name:    qt5-%{qt_module}
-Version: 5.13.2
-Release: 2%{?dist}
+Version: 5.9.6
+Release: 1%{?dist}

 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://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-src-%{version}.tar.xz
-
-# build failure with gcc10
-# various C++ runtime headers indirectly included <string> which in turn
-# included <local> and <cerrno>.  Those indirect inclusions have been
-# eliminated which in turn forces packages to include the C++ headers they
-# actually need.
-Patch0: qtlocation-gcc10.patch
+Source0: https://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz

 # filter plugin/qml provides
 %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$

+## upstreamable patches
+# try to support older glib2 (like el6)
+Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
+
 BuildRequires: qt5-qtbase-devel >= 5.9.0
 # QtPositioning core-private
 BuildRequires: qt5-qtbase-private-devel
@ -52,14 +48,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}


 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
-%patch0 -p1 -b .gcc10
+%setup -q -n %{qt_module}-opensource-src-%{version}
+## G_VALUE_INIT is new in glib-2.30+ only
+%patch50 -p1 -b .G_VALUE_INIT
+

 %build
 # no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
 %{qmake_qt5}

-%make_build
+make %{?_smp_mflags}

 %install
 make install INSTALL_ROOT=%{buildroot}
@ -77,10 +75,11 @@ done
 popd


-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig

 %files
-%license LICENSE.GPL* LICENSE.LGPL*
+%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Location.so.5*
 %{_qt5_archdatadir}/qml/QtLocation/
 %{_qt5_plugindir}/geoservices/
@ -88,10 +87,6 @@ popd
 %dir %{_qt5_archdatadir}/qml/QtPositioning
 %{_qt5_archdatadir}/qml/QtPositioning/*
 %{_qt5_plugindir}/position/
-%{_qt5_libdir}/libQt5PositioningQuick.so.5*
-%dir %{_qt5_archdatadir}/qml/Qt
-%dir %{_qt5_archdatadir}/qml/Qt/labs
-%{_qt5_archdatadir}/qml/Qt/labs/location

 %files devel
 %{_qt5_headerdir}/QtLocation/
@ -100,9 +95,6 @@ popd
 %{_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
@ -111,90 +103,18 @@ popd
 %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
+

 %files examples
 %{_qt5_examplesdir}/


 %changelog
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Tue Jun 12 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.6-1
+- 5.9.6

-* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
- 5.13.2
-
-* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 5.12.5-3
- Rebuild for ICU 65
-
-* Wed Sep 25 2019 Than Ngo <than@redhat.com> - 5.12.5-2
- fixed build failures with gcc10
-
-* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
- 5.12.4
-
-* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
- 5.12.3
-
-* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
- 5.12.1
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 5.11.3-2
- Rebuild for ICU 63
-
-* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
- 5.11.3
-
-* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
- 5.11.2
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 5.11.1-2
- Rebuild for ICU 62
-
-* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
- 5.11.1
-
-* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
- 5.11.0
- drop old G_INIT_VALUE patch (el6 too old anyway)
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 5.10.1-4
- Rebuild for ICU 61.1
-
-* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 5.10.1-3
- Rebuild to fix GCC 8 mis-compilation
-  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
-
-* Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2
- rebuild (gcc)
- use %%make_build %%ldconfig_scriptlets
-
-* Wed Feb 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
- 5.10.1
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Dec 19 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1
- 5.10.0
-
-* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 5.9.3-2
- Rebuild for ICU 60.1
+* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-1
+- 5.9.4

 * Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
 - 5.9.3
--- a/qtlocation-gcc10.patch
+++ b/qtlocation-gcc10.patch
@ -1,31 +0,0 @@
-diff -Nrup a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp	2018-08-10 05:35:38.000000000 -0600
-+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp	2019-09-23 12:51:14.960857485 -0600
-@@ -5,6 +5,7 @@
- #include <unicode/ushape.h>
- 
- #include <memory>
-+#include <stdexcept>
- 
- namespace mbgl {
- 
-diff -Nrup a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
--- a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp	2018-08-10 05:35:38.000000000 -0600
-+++ b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp	2019-09-23 12:46:08.054689805 -0600
-@@ -3,6 +3,7 @@
- #include <mbgl/text/bidi.hpp>
- 
- #include <QString>
-+#include <stdexcept>
- 
- namespace mbgl {
- 
-diff -Nrup a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp	2018-08-10 05:35:38.000000000 -0600
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp	2019-09-23 15:55:06.750723673 -0600
-@@ -1,4 +1,5 @@
- #include <mbgl/util/convert.hpp>
-+#include <cstdint>
- 
- namespace mbgl {
- namespace util {
--- a/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
+++ b/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
@ -0,0 +1,13 @@
+--- qtlocation-opensource-src-5.6.0-beta1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp	2015-11-03 12:20:38.000000000 -0200
+++ qtlocation-opensource-src-5.6.0-beta1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.new	2015-11-10 16:04:55.661725365 -0200
+@@ -57,6 +57,10 @@
+ #define MINIMUM_UPDATE_INTERVAL 1000
+ #define UPDATE_TIMEOUT_COLD_START 120000
+ 
+#ifndef G_VALUE_INIT
+#define G_VALUE_INIT  { 0 }
+#endif
+
+ QT_BEGIN_NAMESPACE
+ 
+ namespace
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-5.13.2.tar.xz) = 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
+SHA512 (qtlocation-opensource-src-5.9.6.tar.xz) = 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
Author	SHA1	Message	Date
Rex Dieter	2e00b468e3	5.9.6	2018-06-12 09:37:29 -05:00
Rex Dieter	14fcb04402	5.9.4	2018-01-24 10:58:08 -06:00