Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error in qt5.15 building qtlocation with gcc13 #182

Merged
merged 2 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions var/spack/repos/builtin/packages/qt/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ class Qt(Package):
# causing qt to fail in ci. This increases that limit to 1024.
patch("qt59-qtbase-qtconfig256.patch", working_dir="qtbase", when="@5.9:5")

# https://bugzilla.altlinux.org/attachment.cgi?id=13362&action=diff#a/gcc13-compilefix.patch_sec1
patch("qt5-15-gcc13.patch", when="@5.15: %gcc@13")

conflicts("%gcc@10:", when="@5.9:5.12.6 +opengl")
conflicts("%gcc@11:", when="@5.8")
conflicts("%apple-clang@13:", when="@:5.13")
Expand Down
34 changes: 34 additions & 0 deletions var/spack/repos/builtin/packages/qt/qt5-15-gcc13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
index a28c59a4..92d928a3 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,6 @@
#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/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
index 13498ccb..4dc82a88 100644
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
@@ -4,6 +4,7 @@
#include <string>
#include <cassert>
#include <cstdlib>
+#include <cstdint>
#include <exception>

// Polyfill needed by Qt when building for Android with GCC
diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
index bc959c9a..2fc62bba 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,6 @@
#pragma once

+#include <cstdint>
#include <mbgl/util/variant.hpp>

namespace mbgl {