* [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/
@ 2016-03-27 12:02 Sam Jorna
0 siblings, 0 replies; 5+ messages in thread
From: Sam Jorna @ 2016-03-27 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 81ccd9d9ed5fcfaa8d85ccacb3bbd456ed59048f
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 10:51:16 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 11:57:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ccd9d9
dev-db/postgis: remove unneeded patches
Package-Manager: portage-2.2.28
dev-db/postgis/files/postgis-1.5-ldflags.patch | 28 ---------------
dev-db/postgis/files/postgis_dbs-1.4 | 49 --------------------------
2 files changed, 77 deletions(-)
diff --git a/dev-db/postgis/files/postgis-1.5-ldflags.patch b/dev-db/postgis/files/postgis-1.5-ldflags.patch
deleted file mode 100644
index 3ccbb71..0000000
--- a/dev-db/postgis/files/postgis-1.5-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naurw postgis-1.5.8.orig/loader/Makefile.in postgis-1.5.8/loader/Makefile.in
---- postgis-1.5.8.orig/loader/Makefile.in 2010-09-10 20:44:05.000000000 +0000
-+++ postgis-1.5.8/loader/Makefile.in 2013-01-30 14:31:01.189692941 +0000
-@@ -79,16 +79,16 @@
- $(CC) $(CFLAGS) $(ICONV_CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
-
- $(PGSQL2SHP): shpopen.o dbfopen.o safileio.o getopt.o pgsql2shp.o $(LIBLWGEOM)
-- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@
-+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@
-
- $(SHP2PGSQL-CLI): stringbuffer.o shpopen.o dbfopen.o safileio.o getopt.o shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
-- $(CC) $(CFLAGS) $^ -o $@ $(ICONV_LDFLAGS) -lm
-+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(ICONV_LDFLAGS) -lm
-
- shp2pgsql-gui.o: shp2pgsql-gui.c
- $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c
-
- $(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o safileio.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES)
-- $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
-+ $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
-
- installdir:
- @mkdir -p $(DESTDIR)$(bindir)
-@@ -106,4 +106,3 @@
-
- clean:
- @rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP) $(GTK_WIN32_RES)
--
diff --git a/dev-db/postgis/files/postgis_dbs-1.4 b/dev-db/postgis/files/postgis_dbs-1.4
deleted file mode 100644
index fa7ac25..0000000
--- a/dev-db/postgis/files/postgis_dbs-1.4
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file is used by 'emerge --config dev-db/postgis' to determine which
-# databases it should install to, upgrade or create as a template.
-
-# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any
-# databases except for templates. All databases you list must already exist in
-# the cluster.
-
-# The user to perform the updates as. This user must have the privileges to
-# modify all of the databases you list here.
-pguser="postgres"
-
-# By default, no databases will have PostGIS enabled. The databases listed here
-# must already exist. The databases you list here must not already be PostGIS
-# enabled. Instead, use the upgrade lists further down.
-#databases=( "your" "databases" )
-
-# Anything you place in this list will create a database and make it a template.
-# It will be PostGIS-enabled. To add additional features, add the template names
-# to the following lists.
-#templates=( "template_postgis" )
-
-# The PostGIS enabled templates will be created using this template.
-from_template="template1"
-
-# For a complete set of EPSG coordinate system definition identifiers, you can
-# also load the spatial_ref_sys.sql definitions file and populate the
-# spatial_ref_sys table. This will permit you to perform ST_Transform()
-# operations on geometries.
-#epsg_databases=( "enable" "epsg" "on" "these" "databases" )
-
-# Add comments to PostGIS functions to the databases in this list.
-#comment_databases=( "comments" "on" "these" "databases" )
-
-# Any databases you have that are already PostGIS enabled can be listed among
-# the following list to perform a soft upgrade. If the soft upgrade fails,
-# you'll need to do a hard upgrade.
-# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade
-
-# Upgrade from PostGIS 1.2 to 1.4
-#upgrade_from_1_2=( "upgrade" "these" "databases" )
-
-# Upgrade from PostGIS 1.3 to 1.4
-#upgrade_from_1_3=( "upgrade" "these" "databases" )
-
-# Perform a minor upgrade for PostGIS 1.4
-#upgrade_from_1_4=( "upgrade" "these" "databases" )
-
-# Uncomment this once you're satisfied with the settings in this file.
-#configured="true"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/
@ 2017-08-27 10:45 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2017-08-27 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 8c98c95b939c0b40e9c061e7a5840db03bb2a652
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 24 17:53:59 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 10:45:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c98c95b
dev-db/postgis: remove unused patch.
Closes: https://github.com/gentoo/gentoo/pull/5522
.../files/postgis-2.1.4-pkgconfig-json.patch | 122 ---------------------
1 file changed, 122 deletions(-)
diff --git a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
deleted file mode 100644
index 13634abb6de..00000000000
--- a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a13cf13..c0a7842 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -780,61 +780,19 @@ dnl ===========================================================================
- dnl Detect if json-c installed
- dnl ===========================================================================
-
--CHECK_JSON=yes
--HAVE_JSON=no
--HAVE_JSON_C=no
--
--AC_ARG_WITH([json],
-- [AS_HELP_STRING([--without-json], [build without json-c support])],
-- [CHECK_JSON="$withval"], [])
--
--if test "$CHECK_JSON" != "no"; then dnl {
--
--AC_ARG_WITH([jsondir],
-- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
-- [JSONDIR="$withval"], [JSONDIR=])
--
--if test ! "x$JSONDIR" = "x"; then
-- dnl Make sure that the directory exists
-- if test "x$JSONDIR" = "xyes"; then
-- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
-- else
-- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
--
-- dnl Add the include directory to JSON_CPPFLAGS
-- JSON_CPPFLAGS="-I$JSONDIR/include"
-- JSON_LDFLAGS="-L$JSONDIR/lib"
-- fi
--fi
--
--dnl Check that we can find the json/json.h header file
--CPPFLAGS_SAVE="$CPPFLAGS"
--CPPFLAGS="$JSON_CPPFLAGS"
--AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [
-- AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes; HAVE_JSON_C=yes], [])
--])
--CPPFLAGS="$CPPFLAGS_SAVE"
--
--dnl Ensure we can link against libjson
--LIBS_SAVE="$LIBS"
--LIBS="$JSON_LDFLAGS"
--AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
-- AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], [])
--], [])
--LIBS="$LIBS_SAVE"
--
--if test "$HAVE_JSON" = "yes"; then
-+PKG_CHECK_MODULES([JSON], [json],
-+ [
-+ HAVE_JSON=yes
- AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
--fi
--if test "$HAVE_JSON_C" = "yes"; then
-- AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir])
--fi
--
--AC_SUBST([JSON_CPPFLAGS])
--AC_SUBST([JSON_LDFLAGS])
--AC_SUBST([HAVE_JSON])
--
--fi dnl }
-+ ],
-+ [
-+ PKG_CHECK_MODULES([JSON], [json-c],
-+ [
-+ HAVE_JSON=yes
-+ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
-+ ],
-+ [HAVE_JSON=no])
-+ ])
-
- dnl ===========================================================================
- dnl Detect GTK+2.0 for GUI
-@@ -927,7 +885,7 @@ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
- CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
- AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
-
--SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
-+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
- AC_SUBST([SHLIB_LINK])
- dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
-
-diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
-index 3cc6256..5ccbb3b 100644
---- a/liblwgeom/Makefile.in
-+++ b/liblwgeom/Makefile.in
-@@ -11,8 +11,8 @@
- # **********************************************************************
-
- CC = @CC@
--CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
--LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
-+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CFLAGS@
-+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LIBS@
- NUMERICFLAGS = @NUMERICFLAGS@
- top_builddir = @top_builddir@
- prefix = @prefix@
-diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c
-index 7019626..ec1d594 100644
---- a/liblwgeom/lwin_geojson.c
-+++ b/liblwgeom/lwin_geojson.c
-@@ -19,13 +19,8 @@
-
- #include <string.h>
-
--#ifdef HAVE_LIBJSON_C
--#include <json-c/json.h>
--#include <json-c/json_object_private.h>
--#else
--#include <json/json.h>
--#include <json/json_object_private.h>
--#endif
-+#include <json.h>
-+#include <json_object_private.h>
-
- #ifndef JSON_C_VERSION
- // Adds support for libjson < 0.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/
@ 2017-09-10 15:41 Sven Wegener
0 siblings, 0 replies; 5+ messages in thread
From: Sven Wegener @ 2017-09-10 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 5a2637f83aa789aeb847242cae2f45b3aab85527
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 15:40:46 2017 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 15:40:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2637f8
Revert "dev-db/postgis: remove unused patch."
This reverts commit 8c98c95b939c0b40e9c061e7a5840db03bb2a652.
The patch is still used by 2.1.8-r1
.../files/postgis-2.1.4-pkgconfig-json.patch | 122 +++++++++++++++++++++
1 file changed, 122 insertions(+)
diff --git a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
new file mode 100644
index 00000000000..13634abb6de
--- /dev/null
+++ b/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
@@ -0,0 +1,122 @@
+diff --git a/configure.ac b/configure.ac
+index a13cf13..c0a7842 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -780,61 +780,19 @@ dnl ===========================================================================
+ dnl Detect if json-c installed
+ dnl ===========================================================================
+
+-CHECK_JSON=yes
+-HAVE_JSON=no
+-HAVE_JSON_C=no
+-
+-AC_ARG_WITH([json],
+- [AS_HELP_STRING([--without-json], [build without json-c support])],
+- [CHECK_JSON="$withval"], [])
+-
+-if test "$CHECK_JSON" != "no"; then dnl {
+-
+-AC_ARG_WITH([jsondir],
+- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
+- [JSONDIR="$withval"], [JSONDIR=])
+-
+-if test ! "x$JSONDIR" = "x"; then
+- dnl Make sure that the directory exists
+- if test "x$JSONDIR" = "xyes"; then
+- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
+- else
+- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
+-
+- dnl Add the include directory to JSON_CPPFLAGS
+- JSON_CPPFLAGS="-I$JSONDIR/include"
+- JSON_LDFLAGS="-L$JSONDIR/lib"
+- fi
+-fi
+-
+-dnl Check that we can find the json/json.h header file
+-CPPFLAGS_SAVE="$CPPFLAGS"
+-CPPFLAGS="$JSON_CPPFLAGS"
+-AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [
+- AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes; HAVE_JSON_C=yes], [])
+-])
+-CPPFLAGS="$CPPFLAGS_SAVE"
+-
+-dnl Ensure we can link against libjson
+-LIBS_SAVE="$LIBS"
+-LIBS="$JSON_LDFLAGS"
+-AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
+- AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], [])
+-], [])
+-LIBS="$LIBS_SAVE"
+-
+-if test "$HAVE_JSON" = "yes"; then
++PKG_CHECK_MODULES([JSON], [json],
++ [
++ HAVE_JSON=yes
+ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
+-fi
+-if test "$HAVE_JSON_C" = "yes"; then
+- AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir])
+-fi
+-
+-AC_SUBST([JSON_CPPFLAGS])
+-AC_SUBST([JSON_LDFLAGS])
+-AC_SUBST([HAVE_JSON])
+-
+-fi dnl }
++ ],
++ [
++ PKG_CHECK_MODULES([JSON], [json-c],
++ [
++ HAVE_JSON=yes
++ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
++ ],
++ [HAVE_JSON=no])
++ ])
+
+ dnl ===========================================================================
+ dnl Detect GTK+2.0 for GUI
+@@ -927,7 +885,7 @@ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
+ CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
+ AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
+
+-SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
++SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
+ AC_SUBST([SHLIB_LINK])
+ dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
+
+diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
+index 3cc6256..5ccbb3b 100644
+--- a/liblwgeom/Makefile.in
++++ b/liblwgeom/Makefile.in
+@@ -11,8 +11,8 @@
+ # **********************************************************************
+
+ CC = @CC@
+-CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
+-LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
++CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CFLAGS@
++LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LIBS@
+ NUMERICFLAGS = @NUMERICFLAGS@
+ top_builddir = @top_builddir@
+ prefix = @prefix@
+diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c
+index 7019626..ec1d594 100644
+--- a/liblwgeom/lwin_geojson.c
++++ b/liblwgeom/lwin_geojson.c
+@@ -19,13 +19,8 @@
+
+ #include <string.h>
+
+-#ifdef HAVE_LIBJSON_C
+-#include <json-c/json.h>
+-#include <json-c/json_object_private.h>
+-#else
+-#include <json/json.h>
+-#include <json/json_object_private.h>
+-#endif
++#include <json.h>
++#include <json_object_private.h>
+
+ #ifndef JSON_C_VERSION
+ // Adds support for libjson < 0.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/
@ 2017-09-29 13:22 Michael Orlitzky
0 siblings, 0 replies; 5+ messages in thread
From: Michael Orlitzky @ 2017-09-29 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 01e905c00457e6d44988b727dd6f7468d852bed5
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 18 13:24:30 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 13:22:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e905c0
dev-db/postgis: remove unused patch
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../postgis/files/postgis-2.1-pkgconfig-json.patch | 125 ---------------------
1 file changed, 125 deletions(-)
diff --git a/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch
deleted file mode 100644
index 9907e73d741..00000000000
--- a/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Naruw postgis-2.1.0.orig/configure.ac postgis-2.1.0/configure.ac
---- postgis-2.1.0.orig/configure.ac 2013-07-09 03:36:15.000000000 +0000
-+++ postgis-2.1.0/configure.ac 2013-08-18 18:14:23.263697970 +0000
-@@ -745,65 +745,21 @@
- dnl Detect if json-c installed
- dnl ===========================================================================
-
--CHECK_JSON=yes
--HAVE_JSON=no
--AC_SUBST([HAVE_JSON])
--
--AC_ARG_WITH([json],
-- [AS_HELP_STRING([--without-json], [build without json-c support])],
-- [CHECK_JSON="$withval"], [])
--
--if test "$CHECK_JSON" != "no"; then dnl {
--
--AC_ARG_WITH([jsondir],
-- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
-- [JSONDIR="$withval"], [JSONDIR=])
--
--if test ! "x$JSONDIR" = "x"; then
-- dnl Make sure that the directory exists
-- if test "x$JSONDIR" = "xyes"; then
-- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
-- else
-- dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
-- if test ! -e "${JSONDIR}/include/json/json.h" -o \
-- ! \( -e "${JSONDIR}/lib/libjson.so" -o \
-- -e "${JSONDIR}/lib/libjson.dll" -o \
-- -e "${JSONDIR}/lib/libjson.dylib" -o \
-- -e "${JSONDIR}/bin/libjson.dll" -o \
-- -e "${JSONDIR}/lib/libjson.a" \)
-- then
-- AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
-- fi
-- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
--
-- dnl Add the include directory to JSON_CPPFLAGS
-- JSON_CPPFLAGS="-I$JSONDIR/include"
-- JSON_LDFLAGS="-L$JSONDIR/lib"
-- fi
--fi
--
--dnl Check that we can find the json/json.h header file
--CPPFLAGS_SAVE="$CPPFLAGS"
--CPPFLAGS="$JSON_CPPFLAGS"
--AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])
--CPPFLAGS="$CPPFLAGS_SAVE"
--
--dnl Ensure we can link against libjson
--LIBS_SAVE="$LIBS"
--LIBS="$JSON_LDFLAGS"
--AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
-- AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], [])
--], [])
--LIBS="$LIBS_SAVE"
--
--if test "$HAVE_JSON" = "yes"; then
-+PKG_CHECK_MODULES([JSON], [json],
-+ [
-+ HAVE_JSON=yes
- AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
--fi
--
--AC_SUBST([JSON_CPPFLAGS])
--AC_SUBST([JSON_LDFLAGS])
-+ ],
-+ [
-+ PKG_CHECK_MODULES([JSON], [json-c],
-+ [
-+ HAVE_JSON=yes
-+ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
-+ ],
-+ [HAVE_JSON=no])
-+ ])
-
--fi dnl }
-+AC_SUBST([HAVE_JSON])
-
- dnl ===========================================================================
- dnl Detect GTK+2.0 for GUI
-@@ -896,7 +852,7 @@
- CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
- AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
-
--SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
-+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
- AC_SUBST([SHLIB_LINK])
- dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
-
-diff -Naruw postgis-2.1.0.orig/liblwgeom/lwin_geojson.c postgis-2.1.0/liblwgeom/lwin_geojson.c
---- postgis-2.1.0.orig/liblwgeom/lwin_geojson.c 2013-02-28 17:42:49.000000000 +0000
-+++ postgis-2.1.0/liblwgeom/lwin_geojson.c 2013-08-18 18:11:52.473943571 +0000
-@@ -17,8 +17,8 @@
-
- #ifdef HAVE_LIBJSON
-
--#include <json/json.h>
--#include <json/json_object_private.h>
-+#include <json.h>
-+#include <json_object_private.h>
- #include <string.h>
-
- static void geojson_lwerror(char *msg, int error_code)
-@@ -551,5 +551,3 @@
- return lwgeom;
- #endif /* HAVE_LIBJSON */
- }
--
--
-diff -Naruw postgis-2.1.0.orig/liblwgeom/Makefile.in postgis-2.1.0/liblwgeom/Makefile.in
---- postgis-2.1.0.orig/liblwgeom/Makefile.in 2013-05-09 19:38:17.000000000 +0000
-+++ postgis-2.1.0/liblwgeom/Makefile.in 2013-08-18 18:11:52.477943594 +0000
-@@ -11,8 +11,8 @@
- # **********************************************************************
-
- CC = @CC@
--CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
--LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
-+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CFLAGS@
-+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LIBS@
- NUMERICFLAGS = @NUMERICFLAGS@
- top_builddir = @top_builddir@
- prefix = @prefix@
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/
@ 2024-11-02 12:06 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-11-02 12:06 UTC (permalink / raw
To: gentoo-commits
commit: 546e660c873c48791c2ab2eb1fe9c28a63621e5e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 21 17:52:49 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 12:05:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546e660c
dev-db/postgis: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-db/postgis/files/postgis-2.2.0-arflags.patch | 18 -----
.../postgis-3.0.3-avoid-calling-ar-directly.patch | 85 ----------------------
.../files/postgis-3.0.3-detect-only-stdc.patch | 17 -----
3 files changed, 120 deletions(-)
diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
deleted file mode 100644
index 97770042d8f6..000000000000
--- a/dev-db/postgis/files/postgis-2.2.0-arflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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.000000000 -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/files/postgis-3.0.3-avoid-calling-ar-directly.patch b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
deleted file mode 100644
index 66a82e1e7261..000000000000
--- a/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7c5acb8ab83ee278f6a16c7279c3a12ca93499e9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 5 Dec 2020 13:38:03 +0100
-Subject: [PATCH] avoid calling ar directly
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- configure.ac | 2 +-
- deps/wagyu/Makefile.in | 4 +++-
- libpgcommon/Makefile.in | 4 +++-
- raster/rt_core/Makefile.in | 1 +
- 4 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f26390..362d3e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS([postgis_config.h])
- AC_CONFIG_MACRO_DIR([macros])
- AC_CONFIG_AUX_DIR([build-aux])
- AC_PROG_INSTALL
--
-+AM_PROG_AR
-
- dnl Invoke libtool: we do this as it is the easiest way to find the PIC
- dnl flags required to build liblwgeom
-diff --git a/deps/wagyu/Makefile.in b/deps/wagyu/Makefile.in
-index 03d2279..05d6629 100644
---- a/deps/wagyu/Makefile.in
-+++ b/deps/wagyu/Makefile.in
-@@ -28,6 +28,8 @@ LDFLAGS = @LDFLAGS@
- top_builddir = @top_builddir@
- libdir = @libdir@
- LIBTOOL = @LIBTOOL@
-+AR = @AR@
-+ARFLAGS = rs
-
- WAGYU_OBJS = \
- lwgeom_wagyu.o
-@@ -78,7 +80,7 @@ WAGYU_HEADERS = \
- all: @WAGYU_LIB@
-
- @WAGYU_LIB@: $(WAGYU_OBJS)
-- ar rs @WAGYU_LIB@ $(WAGYU_OBJS)
-+ $(AR) $(ARFLAGS) @WAGYU_LIB@ $(WAGYU_OBJS)
-
- $(WAGYU_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(WAGYU_HEADERS)
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
-index c44cf5b..78eb282 100644
---- a/libpgcommon/Makefile.in
-+++ b/libpgcommon/Makefile.in
-@@ -12,6 +12,8 @@
- CC=@CC@
- CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
- LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
-+AR = @AR@
-+ARFLAGS = rs
-
- NUMERICFLAGS=@NUMERICFLAGS@
-
-@@ -39,7 +41,7 @@ all: libpgcommon.a
- install uninstall:
-
- libpgcommon.a: $(SA_OBJS) $(SA_HEADERS)
-- ar rs libpgcommon.a $(SA_OBJS)
-+ $(AR) $(ARFLAGS) libpgcommon.a $(SA_OBJS)
-
- maintainer-clean: clean
-
-diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
-index 380a3e7..b399661 100644
---- a/raster/rt_core/Makefile.in
-+++ b/raster/rt_core/Makefile.in
-@@ -18,6 +18,7 @@
- #
- #############################################################################
-
-+AR = @AR@
- ARFLAGS = rs
-
- CC = @CC@
---
-2.29.2
-
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
deleted file mode 100644
index 5b97102bb236..000000000000
--- a/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naruw postgis-3.1.0.orig/configure.ac postgis-3.1.0/configure.ac
---- postgis-3.1.0.orig/configure.ac 2020-12-18 14:39:26.000000000 -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")
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-02 12:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-27 10:45 [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2024-11-02 12:06 Conrad Kostecki
2017-09-29 13:22 Michael Orlitzky
2017-09-10 15:41 Sven Wegener
2016-03-27 12:02 Sam Jorna
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox