qtlocation: backport upstream patch for recent GCC
This commit is contained in:
parent
f7267e9797
commit
9c04596480
@ -76,6 +76,7 @@ let
|
|||||||
./qtbase.patch.d/0014-qtbase-pkg-config.patch
|
./qtbase.patch.d/0014-qtbase-pkg-config.patch
|
||||||
];
|
];
|
||||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||||
|
qtlocation = [ ./qtlocation-gcc-9.patch ];
|
||||||
qtscript = [ ./qtscript.patch ];
|
qtscript = [ ./qtscript.patch ];
|
||||||
qtserialport = [ ./qtserialport.patch ];
|
qtserialport = [ ./qtserialport.patch ];
|
||||||
qtwebengine = [
|
qtwebengine = [
|
||||||
|
21
pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch
Normal file
21
pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
|
||||||
|
index d475c38..c1710a6 100644
|
||||||
|
--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
|
||||||
|
+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
|
||||||
|
@@ -5,6 +5,7 @@
|
||||||
|
#include <unicode/ushape.h>
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
+#include <stdexcept>
|
||||||
|
|
||||||
|
namespace mbgl {
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
|
||||||
|
index 97bfe91..56d3e17 100644
|
||||||
|
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
|
||||||
|
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
|
||||||
|
@@ -1,3 +1,4 @@
|
||||||
|
+#include <cstdint>
|
||||||
|
#include <mbgl/util/convert.hpp>
|
||||||
|
|
||||||
|
namespace mbgl {
|
@ -75,6 +75,7 @@ let
|
|||||||
./qtbase.patch.d/0011-fix-header_module.patch
|
./qtbase.patch.d/0011-fix-header_module.patch
|
||||||
];
|
];
|
||||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||||
|
qtlocation = [ ./qtlocation-gcc-9.patch ];
|
||||||
qtscript = [ ./qtscript.patch ];
|
qtscript = [ ./qtscript.patch ];
|
||||||
qtserialport = [ ./qtserialport.patch ];
|
qtserialport = [ ./qtserialport.patch ];
|
||||||
qtwebengine = [
|
qtwebengine = [
|
||||||
|
21
pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch
Normal file
21
pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
|
||||||
|
index d475c38..c1710a6 100644
|
||||||
|
--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
|
||||||
|
+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
|
||||||
|
@@ -5,6 +5,7 @@
|
||||||
|
#include <unicode/ushape.h>
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
+#include <stdexcept>
|
||||||
|
|
||||||
|
namespace mbgl {
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
|
||||||
|
index 97bfe91..56d3e17 100644
|
||||||
|
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
|
||||||
|
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
|
||||||
|
@@ -1,3 +1,4 @@
|
||||||
|
+#include <cstdint>
|
||||||
|
#include <mbgl/util/convert.hpp>
|
||||||
|
|
||||||
|
namespace mbgl {
|
@ -10,5 +10,4 @@ qtModule {
|
|||||||
# https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
|
# https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
|
||||||
"QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
|
"QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user