Compare commits

...

26 Commits
f27 ... master

Author SHA1 Message Date
Fedora Release Engineering 242d298872 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 16:56:27 +00:00
Jan Grulich 47febde58f 5.13.2 2019-12-09 18:28:29 +01:00
Pete Walter 915265ad0b Rebuild for ICU 65 2019-11-01 15:50:14 +00:00
Than Ngo 81f850e531 fixed build failures with gcc10 2019-09-25 11:29:46 +02:00
Jan Grulich 62bfae6d05 5.12.5 2019-09-24 13:36:48 +02:00
Fedora Release Engineering 3f0e3d1254 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 17:49:19 +00:00
Jan Grulich 0be2edc198 5.12.4 2019-06-14 08:58:11 +02:00
Jan Grulich 03a553cf2c 5.12.3 2019-06-04 15:44:58 +02:00
Rex Dieter dced5fbbcf 5.12.1 2019-02-15 10:22:06 -06:00
Fedora Release Engineering 5c93e822dd - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 10:43:38 +00:00
Pete Walter 74071d35c6 Rebuild for ICU 63 2019-01-23 22:11:23 +00:00
Rex Dieter 15702832c5 5.11.3 2018-12-07 13:19:29 -06:00
Jan Grulich b738b169d5 5.11.2 2018-09-21 13:47:23 +02:00
Fedora Release Engineering 23de6a9f04 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 03:09:12 +00:00
Pete Walter 4367628849 Rebuild for ICU 62 2018-07-10 21:58:55 +01:00
Rex Dieter cb364f2188 5.11.1 2018-06-20 15:09:51 -05:00
Rex Dieter 2ff85ba39d update %%files harder 2018-05-27 14:50:18 -05:00
Rex Dieter bbecbea931 update %%files 2018-05-27 14:13:33 -05:00
Rex Dieter 86612d640b 5.11.0
drop old G_INIT_VALUE patch (el6 too old anyway)
2018-05-27 07:27:43 -05:00
Pete Walter 82e615a2af Rebuild for ICU 61.1 2018-04-30 20:38:57 +01:00
Adam Williamson 551601852d Rebuild to fix GCC 8 mis-compilation
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
2018-03-07 19:31:38 -08:00
Rex Dieter 27ec35882f rebuild (gcc)
use %make_build %ldconfig_scriptlets
2018-03-07 13:19:12 -06:00
Jan Grulich 86f9d759c8 5.10.1 2018-02-14 08:05:48 +01:00
Fedora Release Engineering fdfd34d8d1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 12:24:42 +00:00
Jan Grulich d658bbc9ec 5.10.0 2017-12-20 09:33:00 +01:00
Pete Walter f07da0ef9a Rebuild for ICU 60.1 2017-11-30 20:45:25 +00:00
5 changed files with 144 additions and 33 deletions

13
.gitignore vendored
View File

@ -1,3 +1,10 @@
/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-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

View File

@ -2,21 +2,25 @@
Summary: Qt5 - Location component
Name: qt5-%{qt_module}
Version: 5.9.3
Release: 1%{?dist}
Version: 5.13.2
Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io
Source0: https://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
%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
# 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
@ -48,16 +52,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-opensource-src-%{version}
## G_VALUE_INIT is new in glib-2.30+ only
%patch50 -p1 -b .G_VALUE_INIT
%setup -q -n %{qt_module}-everywhere-src-%{version}
%patch0 -p1 -b .gcc10
%build
# no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
%{qmake_qt5}
make %{?_smp_mflags}
%make_build
%install
make install INSTALL_ROOT=%{buildroot}
@ -75,11 +77,10 @@ done
popd
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
%license LICENSE.GPL* LICENSE.LGPL*
%{_qt5_libdir}/libQt5Location.so.5*
%{_qt5_archdatadir}/qml/QtLocation/
%{_qt5_plugindir}/geoservices/
@ -87,6 +88,10 @@ 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/
@ -95,6 +100,9 @@ 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
@ -103,13 +111,91 @@ 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
* 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
* Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
- 5.9.3

31
qtlocation-gcc10.patch Normal file
View File

@ -0,0 +1,31 @@
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 {

View File

@ -1,13 +0,0 @@
--- 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

View File

@ -1 +1 @@
SHA512 (qtlocation-opensource-src-5.9.3.tar.xz) = 11bf2c6000fc2db92dc857cc6f271e7ff19f500fde14520678e9af57fac41debde4c4b937dbab4fe1f7d5744e1bd0fc25ea32fceecf97d32cecdbbc8e2105373
SHA512 (qtlocation-everywhere-src-5.13.2.tar.xz) = 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f