diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch | 54 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 22 |
3 files changed, 75 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9e04fae9f9..231eb291ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2066,6 +2066,7 @@ dist_patch_DATA = \ %D%/packages/patches/qcodeeditor-qt6.patch \ %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \ %D%/packages/patches/qtdeclarative-disable-qmlcache.patch \ + %D%/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch \ %D%/packages/patches/quodlibet-disable-bundled-packages.patch \ %D%/packages/patches/qucs-s-qucsator-rf-search.patch \ %D%/packages/patches/qxlsx-fix-include-directory.patch \ diff --git a/gnu/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch b/gnu/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch new file mode 100644 index 0000000000..88d4cc2355 --- /dev/null +++ b/gnu/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch @@ -0,0 +1,54 @@ +from https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c15a18309c64c5713ef22cd1113192e69f6b23d + + +From d8054f1efa0b97b291a6f8c7fff9090b0fd4328e Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fvogt@suse.de> +Date: Fri, 3 Mar 2023 11:39:58 +0100 +Subject: [PATCH] Add some missing cstdint inclusions (#872) + +GCC 13 removed some indirect inclusions of cstdint which this relied on. +Include it explicitly to fix build errors. +--- + include/mbgl/util/geometry.hpp | 2 ++ + include/mbgl/util/string.hpp | 1 + + src/mbgl/gl/stencil_mode.hpp | 2 ++ + 3 files changed, 5 insertions(+) + +diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp +index a28c59a47d..283ec7dbbe 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +@@ -1,5 +1,7 @@ + #pragma once + ++#include <cstdint> ++ + #include <mapbox/geometry/geometry.hpp> + #include <mapbox/geometry/point_arithmetic.hpp> + #include <mapbox/geometry/for_each_point.hpp> +diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp +index 13498ccb92..2f6acb6410 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +@@ -3,6 +3,7 @@ + #include <sstream> + #include <string> + #include <cassert> ++#include <cstdint> + #include <cstdlib> + #include <exception> + +diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp +index bc959c9a73..fd00370f88 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +@@ -1,5 +1,7 @@ + #pragma once + ++#include <cstdint> ++ + #include <mbgl/util/variant.hpp> + + namespace mbgl { +-- +GitLab diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34268bb473..552b2cdef6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -137,6 +137,7 @@ #:use-module (gnu packages valgrind) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -2412,7 +2413,24 @@ Server Protocol (LSP) for Qt.") (uri (qt-url name version)) (sha256 (base32 - "0ja5rs1z9lx9hns7m1mg1lndl04arhjajqbdg29j446q5xlzkpk2")))) + "0ja5rs1z9lx9hns7m1mg1lndl04arhjajqbdg29j446q5xlzkpk2")) + (patches + (search-patches "qtlocation-5.15.8-mapboxgl-gcc13.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; TODO: Unvendor more deps. + (with-directory-excursion "src/3rdparty/mapbox-gl-native" + (for-each delete-file-recursively + (list "deps/rapidjson" + "deps/protozero")) + + (substitute* "mapbox-gl-native.pro" + ((" deps/protozero/1\\.5\\.2 \\\\ + deps/protozero/1\\.5\\.2/include \\\\ + deps/rapidjson/1\\.1\\.0 \\\\ + deps/rapidjson/1\\.1\\.0/include \\\\") + ""))))))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ; TODO: Enable the tests @@ -2422,7 +2440,7 @@ Server Protocol (LSP) for Qt.") (lambda _ (setenv "HOME" "/tmp"))))))) (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport-5)) - (inputs (list icu4c openssl qtbase-5 zlib)) + (inputs (list icu4c openssl qtbase-5 zlib rapidjson protozero)) (synopsis "Qt Location and Positioning modules") (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) |