diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index a8f2d82e37e3635e36ba1e51bdbcc427fbc6bfe1..a5b9439aa857befd26ad6f5ec9aa444eef9c4914 100644 --- a/qt5-qtlocation.spec +++ b/qt5-qtlocation.spec @@ -2,12 +2,14 @@ Name: qt5-qtlocation Version: 5.11.1 -Release: 6 +Release: 7 Summary: Qt5 module for Location framework License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io Source0: https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz +Patch0: qtlocation-gcc10.patch + 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}} @@ -83,6 +85,9 @@ cd - %{_qt5_examplesdir}/ %changelog +* Sat Jul 31 2021 wangyong - 5.11.1-7 +- Patch for GCC-10 + * Mon Sep 14 2020 liuweibo - 5.11.1-6 - Fix Source0 diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch new file mode 100644 index 0000000000000000000000000000000000000000..70ce34c8e2bc1586fccebdfbe50b09a5ae268d1b --- /dev/null +++ b/qtlocation-gcc10.patch @@ -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 + + #include ++#include + + 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 + + #include ++#include + + 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 ++#include + + namespace mbgl { + namespace util {