fix build error caused by upgrade to GCC-10
This commit is contained in:
parent
1549ca874a
commit
db2770bbce
@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
Name: qt5-qtlocation
|
Name: qt5-qtlocation
|
||||||
Version: 5.11.1
|
Version: 5.11.1
|
||||||
Release: 6
|
Release: 7
|
||||||
Summary: Qt5 module for Location framework
|
Summary: Qt5 module for Location framework
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
Url: http://www.qt.io
|
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
|
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: 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
|
BuildRequires: pkgconfig(icu-i18n) pkgconfig(libssl) pkgconfig(libcrypto) qt5-qtdeclarative-devel >= 5.9.0
|
||||||
%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
|
%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
|
||||||
@ -83,6 +85,9 @@ cd -
|
|||||||
%{_qt5_examplesdir}/
|
%{_qt5_examplesdir}/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jul 31 2021 wangyong<wangyong187@huawei.com> - 5.11.1-7
|
||||||
|
- Patch for GCC-10
|
||||||
|
|
||||||
* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-6
|
* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-6
|
||||||
- Fix Source0
|
- Fix Source0
|
||||||
|
|
||||||
|
|||||||
31
qtlocation-gcc10.patch
Normal file
31
qtlocation-gcc10.patch
Normal 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 {
|
||||||
Loading…
x
Reference in New Issue
Block a user