Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f7267e9797ac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c0459648006
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Jan 3, 2021

  1. qtlocation: backport upstream patch for recent GCC

    @ttuegel @FRidh
    ttuegel authored and FRidh committed Jan 3, 2021
    Copy the full SHA
    9c04596 View commit details
1 change: 1 addition & 0 deletions pkgs/development/libraries/qt-5/5.12/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
21 changes: 21 additions & 0 deletions pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch
View file
Original file line number Diff line number Diff line change
@@ -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 {
1 change: 1 addition & 0 deletions pkgs/development/libraries/qt-5/5.14/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
21 changes: 21 additions & 0 deletions pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch
View file
Original file line number Diff line number Diff line change
@@ -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 {
1 change: 0 additions & 1 deletion pkgs/development/libraries/qt-5/modules/qtlocation.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
];

}