mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
db4eafca9d
Fixes guix/guix#712 * gnu/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/qt.scm (qtlocation-5)[source]: <patches>: use it. <snippet>: unvendor rapidjson and protozero. [inputs]: Add rapidjson and protozero. Change-Id: I57b32863ae905d26539b43296cea8c1a18f91170
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
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
|