[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/, dev-db/postgis/
commit: dc10ecae76251e05914bdd47a9728a42ef0cc853
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 29 18:50:28 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 29 19:09:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc10ecae
dev-db/postgis: Fix build with dev-cpp/abseil-cpp-20230125.2
Closes: https://bugs.gentoo.org/905378
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../postgis-3.3.2-flatbuffers-abseil-2023.patch| 39 ++
dev-db/postgis/postgis-3.3.2-r1.ebuild | 2 ++
2 files changed, 41 insertions(+)
diff --git a/dev-db/postgis/files/postgis-3.3.2-flatbuffers-abseil-2023.patch
b/dev-db/postgis/files/postgis-3.3.2-flatbuffers-abseil-2023.patch
new file mode 100644
index ..670361b5b29e
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.3.2-flatbuffers-abseil-2023.patch
@@ -0,0 +1,39 @@
+From 411abb7014b05b809c0644f196425af1028e7ad3 Mon Sep 17 00:00:00 2001
+From: Berke
+Date: Fri, 7 Apr 2023 22:05:45 +0300
+Subject: [PATCH] additional check for absl::string_view availability
+
+absl::string_view is uses std::string_view when available. It already checks
if std::string_view is available in the earlier code.
+It should only use absl::string_view implementation.
+---
+ deps/flatgeobuf/include/flatbuffers/base.h | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/deps/flatgeobuf/include/flatbuffers/base.h
b/deps/flatgeobuf/include/flatbuffers/base.h
+index bc64f18ad93..98a02262c2b 100644
+--- a/deps/flatgeobuf/include/flatbuffers/base.h
b/deps/flatgeobuf/include/flatbuffers/base.h
+@@ -233,12 +233,17 @@ namespace flatbuffers {
+ }
+ #define FLATBUFFERS_HAS_STRING_VIEW 1
+ // Check for absl::string_view
+-#elif __has_include("absl/strings/string_view.h")
+- #include "absl/strings/string_view.h"
+- namespace flatbuffers {
+-typedef absl::string_view string_view;
+- }
+- #define FLATBUFFERS_HAS_STRING_VIEW 1
++#elif __has_include("absl/strings/string_view.h") && \
++ __has_include("absl/base/config.h") && \
++ (__cplusplus >= 201411)
++ #include "absl/base/config.h"
++ #if !defined(ABSL_USES_STD_STRING_VIEW)
++#include "absl/strings/string_view.h"
++namespace flatbuffers {
++ typedef absl::string_view string_view;
++}
++#define FLATBUFFERS_HAS_STRING_VIEW 1
++ #endif
+ #endif
+ #endif // __has_include
+ #endif // !FLATBUFFERS_HAS_STRING_VIEW
diff --git a/dev-db/postgis/postgis-3.3.2-r1.ebuild
b/dev-db/postgis/postgis-3.3.2-r1.ebuild
index 40199711aa2c..5e948c1a6828 100644
--- a/dev-db/postgis/postgis-3.3.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.2-r1.ebuild
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+ # source: https://github.com/google/flatbuffers/pull/7897
+ "${FILESDIR}/${P}-flatbuffers-abseil-2023.patch" # bug 905378
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/, dev-db/postgis/
commit: 0fa80295af29bf426677f4f7fbdb7dc1f0fc1f4e
Author: Aaron W. Swenson gentoo org>
AuthorDate: Thu Dec 24 03:42:36 2020 +
Commit: Aaron W. Swenson gentoo org>
CommitDate: Thu Dec 24 03:42:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa80295
dev-db/postgis: Version Bump and Fix
Bump to 3.1.0.
No longer auto-magically depend on libcxx, and tries more names for a compatible
CPP interface.
Bug: https://bugs.gentoo.org/731104
Bug: https://bugs.gentoo.org/747544
Signed-off-by: Aaron W. Swenson gentoo.org>
dev-db/postgis/Manifest| 1 +
.../files/postgis-3.0.3-detect-only-stdc.patch | 17 +++
.../files/postgis-3.0.3-try-other-cpp-names.patch | 12 ++
dev-db/postgis/postgis-3.0.3-r2.ebuild | 139
dev-db/postgis/postgis-3.1.0.ebuild| 140 +
5 files changed, 309 insertions(+)
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 705f54c7fd9..7d45c2f6ebb 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,5 @@ DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B
aa83bdc2d1950c517f99cbdd877eb7261f6c2
DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
SHA512
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227
DIST postgis-3.0.2.tar.gz 16855299 BLAKE2B
99ee872abf52651ab53e4dd6203d99d428d366f60b949fabcae938980f5c17809872e9b23f7ab1f3480a60242e735c926e54122492e1b8966ed8c748eb7c4fe6
SHA512
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
SHA512
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
+DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
SHA512
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
DIST postgis-3.1.0alpha3.tar.gz 17197128 BLAKE2B
f3b777efa8542b82db6031fa77a5728be94689542b45e4515887306cd0ae42cd9d802eae94b07e5a70f308e82fe6afc49a29f43ad2c302d9913f00797118764c
SHA512
758b688aa01babc5ac9cc703d3d64fd751639425df7e1a2aa5bb72f1707a8279f87e7b3d84e23f465a51d08787858e0eb54e0afc38039d69ddfe7668e2dce256
diff --git a/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
b/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
new file mode 100644
index 000..5b97102bb23
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
@@ -0,0 +1,17 @@
+diff -Naruw postgis-3.1.0.orig/configure.ac postgis-3.1.0/configure.ac
+--- postgis-3.1.0.orig/configure.ac2020-12-18 14:39:26.0 -0500
postgis-3.1.0/configure.ac 2020-12-19 07:35:13.232167083 -0500
+@@ -1501,12 +1501,9 @@
+ dnl
+ CC="$WAGYU_CXX"
+
+-AC_CHECK_LIB(c++, main, [HAVE_CPP=yes], [HAVE_CPP=no])
+ AC_CHECK_LIB(stdc++, main, [HAVE_STDCPP=yes], [HAVE_STDCPP=no])
+
+-if test "x$HAVE_CPP" = "xyes"; then
+-WAGYU_LDFLAGS="-lc++"
+-elif test "x$HAVE_STDCPP" = "xyes"; then
++if test "x$HAVE_STDCPP" = "xyes"; then
+ WAGYU_LDFLAGS="-lstdc++"
+ else
+ AC_MSG_WARN("Could not find a C++ standard library")
diff --git a/dev-db/postgis/files/postgis-3.0.3-try-other-cpp-names.patch
b/dev-db/postgis/files/postgis-3.0.3-try-other-cpp-names.patch
new file mode 100644
index 000..691cf8d1936
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-try-other-cpp-names.patch
@@ -0,0 +1,12 @@
+diff -Naruw postgis-3.1.0.orig/configure.ac postgis-3.1.0/configure.ac
+--- postgis-3.1.0.orig/configure.ac2020-12-18 14:39:26.0 -0500
postgis-3.1.0/configure.ac 2020-12-23 21:44:09.223273050 -0500
+@@ -31,7 +31,7 @@
+ dnl
+ dnl SQL Preprocessor
+ dnl
+-AC_PATH_PROG([CPPBIN], [cpp], [])
++AC_PATH_PROGS([CPPBIN], [cpp x86_64-pc-linux-gnu-cpp x86-pc-linux-gnu-cpp],
[])
+ if test "x$CPPBIN" != "x"; then
+ SQLPP="${CPPBIN} -traditional-cpp -w -P"
+ else
diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild
b/dev-db/postgis/postgis-3.0.3-r2.ebuild
new file mode 100644
index 000..407f889068d
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/, dev-db/postgis/
commit: 90d62e3a26af09f03028711f9ddb843e1264a8a2
Author: Aaron W. Swenson gentoo org>
AuthorDate: Tue Dec 15 12:25:36 2015 +
Commit: Aaron Swenson gentoo org>
CommitDate: Tue Dec 15 12:25:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d62e3a
dev-db/postgis: Version Bump
Version bump fixing bug 564502.
Bug: 564502
Package-Manager: portage-2.2.20.1
dev-db/postgis/Manifest | 1 +
dev-db/postgis/files/postgis-2.2.0-arflags.patch | 18 +++
dev-db/postgis/postgis-2.2.0.ebuild | 143 +++
3 files changed, 162 insertions(+)
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2862459..06cc042 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,3 +7,4 @@ DIST postgis-2.1.5.tar.gz 6827999 SHA256
0d0e27f72f12b8dba456fbde25ed0f6913f42ba
DIST postgis-2.1.6.tar.gz 6803831 SHA256
6ffdf655bc4fca2b5495dd96f44b266e84111912d5c3f91b832023c4fec5c222 SHA512
a6c1263d64f2c1828656d5613840d721fb70ecbdfab3e28099c8f6b80d5404d46a9376913c0ab46c7f1109517c04430800b8c3be0c94d964421c6681afb2f997
WHIRLPOOL
98bfcae992f444b63840a28ef90077c01473ea528aa72ae5fd283b4fdcf7b7e37732afeac1a29fc87e330f687ca491d5afbed44b0792fb00763dc682501d37a3
DIST postgis-2.1.7.tar.gz 6804372 SHA256
00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2 SHA512
021fcb73c2109dafb67cb9d459eb08e0da7e55cf1a5fab81115aad3b0a61809b8f83d7a278aa04e41ecd633164e4257a90d5dfc0e81339b0c322e7d41d3c5eae
WHIRLPOOL
938cacf1af4ba8a2f0f3bbefe11c0014a31cd331186cd7fc7fc0a242528094efb617326a484bdad76704bfb98fd065a7f280ab663088440af0555fc69862e36b
DIST postgis-2.1.8.tar.gz 6811272 SHA256
7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512
e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4
WHIRLPOOL
b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
+DIST postgis-2.2.0.tar.gz 10164837 SHA256
66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512
e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f
WHIRLPOOL
639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db1ebbc8970a68375894a6179970ab6c0e6c637a2
diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch
b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
new file mode 100644
index 000..9777004
--- /dev/null
+++ b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
@@ -0,0 +1,18 @@
+diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+--- a/raster/rt_core/Makefile.in 2015-05-13 14:13:18.0 -0400
b/raster/rt_core/Makefile.in 2015-12-14 16:49:49.166156232 -0500
+@@ -18,7 +18,7 @@
+ #
+ #
+
+-AR = ar rs
++ARFLAGS = rs
+
+ CC = @CC@
+ LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a
+@@ -64,4 +64,4 @@
+ rm -f Makefile
+
+ librtcore.a: $(RT_OBJS)
+- $(AR) $(RT_LIB) $(RT_OBJS)
++ $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)
diff --git a/dev-db/postgis/postgis-2.2.0.ebuild
b/dev-db/postgis/postgis-2.2.0.ebuild
new file mode 100644
index 000..6fb8ddc
--- /dev/null
+++ b/dev-db/postgis/postgis-2.2.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v 1.2
2014/11/08 12:51:46 titanofold Exp $
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net;
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+ || (
+ dev-db/postgresql:9.5[server]
+ dev-db/postgresql:9.4[server]
+ dev-db/postgresql:9.3[server]
+ dev-db/postgresql:9.2[server]
+ dev-db/postgresql:9.1[server]
+ )
+ dev-libs/json-c
+ dev-libs/libxml2:2
+ >=sci-libs/geos-3.5.0
+ >=sci-libs/proj-4.6.0
+ >=sci-libs/gdal-1.10.0
+ gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/libxslt
+ || (
+
