diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-01-05 06:31:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-05 06:31:58 +0000 |
commit | e4d9d6796d5018e338f0b27a3bc97716195bf0b8 (patch) | |
tree | 38d56da69a3b5d5ccc7d73796d38469f5d4e610c /sci-libs/geos | |
parent | 38efae7f3eb932ed41510139679efd5c1e2f5eda (diff) |
gentoo auto-resync : 05:01:2025 - 06:31:57edge
Diffstat (limited to 'sci-libs/geos')
-rw-r--r-- | sci-libs/geos/Manifest | 1 | ||||
-rw-r--r-- | sci-libs/geos/files/geos-3.11.1-gcc-13.patch | 111 |
2 files changed, 0 insertions, 112 deletions
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 25a1a39770a8..d2d286ee5c26 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,4 +1,3 @@ -AUX geos-3.11.1-gcc-13.patch 3330 BLAKE2B 2da75c8f658dd4358089be745fffec8fa49e997c9ade7146e168e8c9cdf05dc532369240a0766b9ccc0aff9335d8155ca99299fb617e895a3b718138a36fb248 SHA512 fc568dc1c458e791c973fb72ecdd433784439a1c427f850cb99c7d5b69190c98e6731b9e5231c39e2a92552e3cd22f897691c3dd3c473f96c604f7935d2a7e9e AUX geos-3.11.2-gcc-13.patch 1355 BLAKE2B 1ca9b94ee975bdfb265af74c1d5ebd88951aacaf615f1ab13bf9ac01a237b8f464cd61928de70b5c1273330bc5f1cd989b0faeb9ec4b7bfd39dbd8b157e74649 SHA512 a83a40c6c573e127d33c704685bf470831c91d915678cc2cf09207433e2dd8d3d5eff44974c29e1eb5346c984fefdfcad74ae9a82f2ea6594bdf2119e19b182f DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec DIST geos-3.12.1.tar.bz2 6727199 BLAKE2B 4ffc9cb63f3ac15b3dcb0ba9fec6a1ccaeaf35962a057234f4da38d6bba19df39e800805badfd56fe927da09c9392f0feaf2b7d02085e8f293c4d9503ab28ff9 SHA512 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d diff --git a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch b/sci-libs/geos/files/geos-3.11.1-gcc-13.patch deleted file mode 100644 index 45054e860082..000000000000 --- a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch +++ /dev/null @@ -1,111 +0,0 @@ -https://github.com/libgeos/geos/commit/0e8d4368b8bd72a7d361286e8523ebce5cff6146 -https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1 - -From 0e8d4368b8bd72a7d361286e8523ebce5cff6146 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Tue, 29 Nov 2022 23:10:22 +0000 -Subject: [PATCH] Add missing <cstdint> includes for gcc-13 (#743) - -Without the change build on `gcc-13` fails as: - - geos/include/geos/geomgraph/TopologyLocation.h:143:52: error: 'uint32_t' has not been declared - 143 | bool isEqualOnSide(const TopologyLocation& le, uint32_t locIndex) const - | ^~~~~~~~ ---- a/include/geos/geomgraph/Depth.h -+++ b/include/geos/geomgraph/Depth.h -@@ -24,6 +24,7 @@ - #include <geos/geom/Location.h> - #include <geos/geom/Position.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/include/geos/geomgraph/TopologyLocation.h -+++ b/include/geos/geomgraph/TopologyLocation.h -@@ -27,6 +27,7 @@ - #include <array> - #include <string> - #include <cassert> -+#include <cstdint> - - #ifdef _MSC_VER - #pragma warning(push) ---- a/include/geos/io/WKTWriter.h -+++ b/include/geos/io/WKTWriter.h -@@ -24,6 +24,7 @@ - - #include <string> - #include <cctype> -+#include <cstdint> - - #ifdef _MSC_VER - #pragma warning(push) ---- a/include/geos/operation/overlayng/OverlayLabel.h -+++ b/include/geos/operation/overlayng/OverlayLabel.h -@@ -14,6 +14,8 @@ - - #pragma once - -+#include <cstdint> -+ - #include <geos/geom/Location.h> - #include <geos/geom/Position.h> - #include <geos/export.h> ---- a/include/geos/shape/fractal/HilbertCode.h -+++ b/include/geos/shape/fractal/HilbertCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/include/geos/shape/fractal/MortonCode.h -+++ b/include/geos/shape/fractal/MortonCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { - -From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <mail@heiko-becker.de> -Date: Mon, 23 Jan 2023 15:56:11 +0100 -Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805) - -In addition to [1]. Otherwise geos fails to build with: -"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level' - 40 | HilbertEncoder(uint32_t p_level, geom::Envelope& extent); - | ~ ^~~~~~~~ - | ) -/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type - 41 | uint32_t encode(const geom::Envelope* env); - | ^~~~~~~~" - -[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -19,6 +19,7 @@ - #include <geos/geom/Geometry.h> - #include <string> - #include <vector> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/tests/unit/capi/GEOSMakeValidTest.cpp -+++ b/tests/unit/capi/GEOSMakeValidTest.cpp -@@ -9,6 +9,7 @@ - #include <cstdlib> - #include <cmath> - #include <cstring> -+#include <cstdint> - - #include "capi_test_utils.h" - - |