Fixed FTBFS

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -8,3 +8,12 @@
 /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-everywhere-src-5.14.2.tar.xz
+/qtlocation-everywhere-src-5.15.1.tar.xz
+/qtlocation-everywhere-src-5.15.2.tar.xz
+/qtlocation-everywhere-opensource-src-5.15.3.tar.xz
+/qtlocation-everywhere-opensource-src-5.15.4.tar.xz
+/qtlocation-everywhere-opensource-src-5.15.5.tar.xz
+/qtlocation-everywhere-opensource-src-5.15.6.tar.xz
+/qtlocation-everywhere-opensource-src-5.15.7.tar.xz
+/qtlocation-everywhere-opensource-src-5.15.8.tar.xz

qt5-qtlocation.spec

@@ -2,14 +2,14 @@
 
 Summary: Qt5 - Location component
 Name:    qt5-%{qt_module}
-Version: 5.13.2
-Release: 2%{?dist}
+Version: 5.15.8
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
-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/%{qt_module}-everywhere-src-%{version}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
 
 # build failure with gcc10
 # various C++ runtime headers indirectly included <string> which in turn
@@ -21,6 +21,7 @@ Patch0: qtlocation-gcc10.patch
 # 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
@@ -56,6 +57,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %patch0 -p1 -b .gcc10
 
 %build
+# QT is known not to work properly with LTO at this point.  Some of the issues
+# are being worked on upstream and disabling LTO should be re-evaluated as
+# we update this change.  Until such time...
+# Disable LTO
+%define _lto_cflags %{nil}
+
 # no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
 %{qmake_qt5}
 
@@ -89,9 +96,6 @@ popd
 %{_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/
@@ -121,6 +125,85 @@ popd
 
 
 %changelog
+* Mon Feb 20 2023 Than Ngo <than@redhat.com> - 5.15.8-4
+- Fixed FTBFS
+
+* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-3
+- migrated to SPDX license
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-1
+- 5.15.8
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 5.15.7-2
+- Rebuild for ICU 72
+
+* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
+- 5.15.7
+
+* Tue Sep 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.6-1
+- 5.15.6
+
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.15.5-3
+- Rebuilt for ICU 71.1
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
+- 5.15.5
+
+* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
+- 5.15.4
+
+* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
+- 5.15.3
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 5.15.2-6
+- Rebuild for ICU 69
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 5.15.2-5
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 15 15:15:20 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3
+- Bump for eln build
+
+* Tue Nov 24 07:54:14 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
+- Rebuild for qtbase with -no-reduce-relocations option
+
+* Fri Nov 20 09:30:46 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
+- 5.15.2
+
+* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
+- 5.15.1
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 5.14.2-3
+- Disable LTO
+
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 5.14.2-2
+- Rebuild for ICU 67
+
+* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
+- 5.14.2
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

qtlocation-gcc10.patch

@@ -1,17 +1,7 @@
-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
+diff --git a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
+index b75d038..b367ee6 100644
+--- a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
++++ b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
 @@ -3,6 +3,7 @@
  #include <mbgl/text/bidi.hpp>
  
@@ -20,12 +10,35 @@ diff -Nrup a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdpar
  
  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>
+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 <cstdint>
++
+ #include <mapbox/geometry/geometry.hpp>
+ #include <mapbox/geometry/point_arithmetic.hpp>
+ #include <mapbox/geometry/for_each_point.hpp>
+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 <string>
+ #include <cassert>
+ #include <cstdlib>
++#include <cstdint>
+ #include <exception>
+ 
+ // 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 <cstdint>
+ #include <mbgl/util/variant.hpp>
  
  namespace mbgl {
- namespace util {

sources

@@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-5.13.2.tar.xz) = 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
+SHA512 (qtlocation-everywhere-opensource-src-5.15.8.tar.xz) = a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514

sources.basename

@@ -0,0 +1 @@
+qtlocation-everywhere-src