[neon/qt/qtlocation/Neon/testing] debian/patches: remove obsolete patch

Jonathan Riddell null at kde.org
Wed Oct 21 16:03:17 BST 2020


Git commit c34139c8ce6c716aff3f06cec5c822af05afc140 by Jonathan Riddell.
Committed on 21/10/2020 at 15:03.
Pushed by jriddell into branch 'Neon/testing'.

remove obsolete patch

D  +0    -36   debian/patches/gcc10.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtlocation/commit/c34139c8ce6c716aff3f06cec5c822af05afc140

diff --git a/debian/patches/gcc10.diff b/debian/patches/gcc10.diff
deleted file mode 100644
index ff26ae3..0000000
--- a/debian/patches/gcc10.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: fix mapbox-gl-native build with GCC 10
-Origin: upstream, commits
- https://github.com/mapbox/mapbox-gl-native/commit/0853378b2f2de82c
- https://github.com/mapbox/mapbox-gl-native/commit/d7e368c42f2ac797
-Last-Update: 2020-04-27
-
---- 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 {
- 
---- a/src/3rdparty/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp
-@@ -1,6 +1,7 @@
- #include <mbgl/renderer/sources/render_vector_source.hpp>
- #include <mbgl/renderer/render_tile.hpp>
- #include <mbgl/renderer/paint_parameters.hpp>
-+#include <mbgl/tile/tile_loader_impl.hpp>
- #include <mbgl/tile/vector_tile.hpp>
- 
- #include <mbgl/algorithm/generate_clip_ids.hpp>
---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-@@ -1,5 +1,7 @@
- #include <mbgl/util/convert.hpp>
- 
-+#include <cstdint>
-+
- namespace mbgl {
- namespace util {
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7cd497c..7897018 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 use_system_dependencies.diff
 hurd_geoclue.diff
 mapboxgl_thread_portability.diff
-gcc10.diff


More information about the Neon-commits mailing list