* [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/
@ 2016-03-23 5:44 Sam Jorna
0 siblings, 0 replies; 2+ messages in thread
From: Sam Jorna @ 2016-03-23 5:44 UTC (permalink / raw
To: gentoo-commits
commit: a5ddd09f034237fe05f99b03297c4ce05c15f7fb
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 05:43:25 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 05:43:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ddd09f
sci-libs/geos: remove unneeded patches
Package-Manager: portage-2.2.28
sci-libs/geos/files/3.2.0-darwin.patch | 13 ---------
sci-libs/geos/files/3.2.0-python.patch | 40 ---------------------------
sci-libs/geos/files/3.3.2-solaris-isnan.patch | 13 ---------
sci-libs/geos/files/3.4.1-solaris-isnan.patch | 14 ----------
sci-libs/geos/files/3.4.2-ruby_so_name.patch | 12 --------
5 files changed, 92 deletions(-)
diff --git a/sci-libs/geos/files/3.2.0-darwin.patch b/sci-libs/geos/files/3.2.0-darwin.patch
deleted file mode 100644
index 2701b59..0000000
--- a/sci-libs/geos/files/3.2.0-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Also check for dylib before giving up, bug #335811
-
---- macros/ac_python_devel.m4
-+++ macros/ac_python_devel.m4
-@@ -42,7 +42,7 @@
- # Check for Python library path
- AC_MSG_CHECKING([for Python library path])
- python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
-- if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
-+ if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so && test ! -f "${python_path}"/libpython$PYTHON_VERSION.dylib ; then
- python_path=""
- fi
- AC_MSG_RESULT([$python_path])
diff --git a/sci-libs/geos/files/3.2.0-python.patch b/sci-libs/geos/files/3.2.0-python.patch
deleted file mode 100644
index b4a85c0..0000000
--- a/sci-libs/geos/files/3.2.0-python.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/macros/ac_python_devel.m4 b/macros/ac_python_devel.m4
-index d67842b..f3a3a3b 100644
---- a/macros/ac_python_devel.m4
-+++ b/macros/ac_python_devel.m4
-@@ -29,13 +29,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
-
- # Check for Python include path
- AC_MSG_CHECKING([for Python include path])
-- for i in "$base_python_path/include/python$PYTHON_VERSION/" "$base_python_path/include/python/" "$base_python_path/include/" "$base_python_path/" ; do
-- python_path=`find $i -type f -name Python.h -print 2> /dev/null | sed "1q"`
-- if test -n "$python_path" ; then
-- break
-- fi
-- done
-- python_path=`echo $python_path | sed "s,/Python.h$,,"`
-+ python_path="${base_python_path}/include/python$PYTHON_VERSION/"
-+ if test ! -f "${python_path}"/Python.h ; then
-+ python_path=""
-+ fi
- AC_MSG_RESULT([$python_path])
- if test -z "$python_path" ; then
- AC_MSG_ERROR([cannot find Python include path])
-@@ -44,13 +41,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
-
- # Check for Python library path
- AC_MSG_CHECKING([for Python library path])
-- for i in "$base_python_path/lib/python$PYTHON_VERSION/config/" "$base_python_path/lib/python$PYTHON_VERSION/" "$base_python_path/lib/python/config/" "$base_python_path/lib/python/" "$base_python_path/" "$base_python_path/libs/" ; do
-- python_path=`find $i -name libpython$PYTHON_VERSION.* -print 2> /dev/null | sed "1q"`
-- if test -n "$python_path" ; then
-- break
-- fi
-- done
-- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
-+ python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
-+ if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
-+ python_path=""
-+ fi
- AC_MSG_RESULT([$python_path])
- if test -z "$python_path" ; then
- AC_MSG_ERROR([cannot find Python library path])
diff --git a/sci-libs/geos/files/3.3.2-solaris-isnan.patch b/sci-libs/geos/files/3.3.2-solaris-isnan.patch
deleted file mode 100644
index 04dc131..0000000
--- a/sci-libs/geos/files/3.3.2-solaris-isnan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/geos/platform.h.in
-+++ include/geos/platform.h.in
-@@ -97,8 +97,9 @@
- // It does leave a version in std.
- # define ISNAN(x) (std::isnan(x))
- # elif defined(__sun) || defined(__sun__)
-+# define _XOPEN_SOURCE 600 // force iso/math_c99
- # include <math.h>
--# define ISNAN(x) (::isnan(x))
-+# define ISNAN(x) (std::isnan(x))
- # endif
- #endif
-
diff --git a/sci-libs/geos/files/3.4.1-solaris-isnan.patch b/sci-libs/geos/files/3.4.1-solaris-isnan.patch
deleted file mode 100644
index f4cb2ae..0000000
--- a/sci-libs/geos/files/3.4.1-solaris-isnan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naruw geos-3.4.1.orig/include/geos/platform.h.in geos-3.4.1/include/geos/platform.h.in
---- geos-3.4.1.orig/include/geos/platform.h.in 2013-08-17 14:08:04.000000000 +0000
-+++ geos-3.4.1/include/geos/platform.h.in 2013-08-18 22:00:59.412676805 +0000
-@@ -96,8 +96,9 @@
- // It does leave a version in std.
- # define ISNAN(x) (std::isnan(x))
- # elif defined(__sun) || defined(__sun__)
-+# define _XOPEN_SOURCE 600 // force iso/math_c99
- # include <math.h>
--# define ISNAN(x) (::isnan(x))
-+# define ISNAN(x) (std::isnan(x))
- # endif
- #endif
-
diff --git a/sci-libs/geos/files/3.4.2-ruby_so_name.patch b/sci-libs/geos/files/3.4.2-ruby_so_name.patch
deleted file mode 100644
index 4168e5c..0000000
--- a/sci-libs/geos/files/3.4.2-ruby_so_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur geos-3.4.2.orig/macros/ruby.m4 geos-3.4.2/macros/ruby.m4
---- a/macros/ruby.m4 2013-08-25 11:10:32.000000000 -0400
-+++ b/macros/ruby.m4 2014-11-05 06:35:39.347830878 -0500
-@@ -38,7 +38,7 @@
- RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'`
-
- dnl Get Ruby shared library name, this does not include the lib prefix or extension name
-- RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
-+ RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
-
- dnl Get Ruby shared libary name
- RUBY_SHARED_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY"]] || Config::CONFIG[["LIBRUBY"]]'`
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/
@ 2025-01-04 22:47 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2025-01-04 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 435a3311a75bcb88f229c3d9b6f18c36196640ac
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jan 3 15:38:02 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 22:47:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435a3311
sci-libs/geos: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sci-libs/geos/files/geos-3.11.1-gcc-13.patch | 111 ---------------------------
1 file changed, 111 deletions(-)
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"
-
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-04 22:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-23 5:44 [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/ Sam Jorna
-- strict thread matches above, loose matches on Subject: below --
2025-01-04 22:47 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox