fixed build failures with gcc10
This commit is contained in:
parent
62bfae6d05
commit
81f850e531
|
@ -3,7 +3,7 @@
|
||||||
Summary: Qt5 - Location component
|
Summary: Qt5 - Location component
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.12.5
|
Version: 5.12.5
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
|
@ -11,6 +11,13 @@ Url: http://www.qt.io
|
||||||
%global majmin %(echo %{version} | cut -d. -f1-2)
|
%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-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
|
# filter plugin/qml provides
|
||||||
%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
|
%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
|
||||||
|
|
||||||
|
@ -46,7 +53,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
||||||
|
%patch0 -p1 -b .gcc10
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
|
# no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
|
||||||
|
@ -114,6 +121,9 @@ popd
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
|
||||||
- 5.12.5
|
- 5.12.5
|
||||||
|
|
||||||
|
|
|
@ -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…
Reference in New Issue