Revert PR 40091 which duplicates PR 38987 (#40107)
This commit is contained in:
parent
a7ee72708a
commit
e16ca49036
@ -155,9 +155,6 @@ class Qt(Package):
|
|||||||
# causing qt to fail in ci. This increases that limit to 1024.
|
# causing qt to fail in ci. This increases that limit to 1024.
|
||||||
patch("qt59-qtbase-qtconfig256.patch", working_dir="qtbase", when="@5.9:5")
|
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@10:", when="@5.9:5.12.6 +opengl")
|
||||||
conflicts("%gcc@11:", when="@5.8")
|
conflicts("%gcc@11:", when="@5.8")
|
||||||
conflicts("%apple-clang@13:", when="@:5.13")
|
conflicts("%apple-clang@13:", when="@:5.13")
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
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 {
|
|
Loading…
Reference in New Issue
Block a user