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@
