diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-12-31 06:11:38 -0600 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-01-03 10:00:18 +0100 |
| commit | 9c045964800660d7ba357360bfa310bbad5dd4dd (patch) | |
| tree | 4d51adefc2c59e8151dee6aba944e579764eac82 /pkgs/development/libraries | |
| parent | f7267e9797ac07efd6e9e2f4b21bb0068779b5b6 (diff) | |
| download | nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.tar nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.tar.gz nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.tar.bz2 nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.tar.lz nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.tar.xz nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.tar.zst nixpkgs-9c045964800660d7ba357360bfa310bbad5dd4dd.zip | |
qtlocation: backport upstream patch for recent GCC
Diffstat (limited to 'pkgs/development/libraries')
5 files changed, 44 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 98dd7a47961..87a88ddf9b0 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -76,6 +76,7 @@ let ./qtbase.patch.d/0014-qtbase-pkg-config.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; + qtlocation = [ ./qtlocation-gcc-9.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ diff --git a/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch b/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch new file mode 100644 index 00000000000..1791313e560 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch @@ -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 { diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index dff04b24f60..3eefd23fde7 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -75,6 +75,7 @@ let ./qtbase.patch.d/0011-fix-header_module.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; + qtlocation = [ ./qtlocation-gcc-9.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ diff --git a/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch b/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch new file mode 100644 index 00000000000..1791313e560 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch @@ -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 { diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 0eee684a53f..a80785d8099 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -10,5 +10,4 @@ qtModule { # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" ]; - } |