diff options
author | 2016-07-19 19:29:57 +0200 | |
---|---|---|
committer | 2016-07-30 08:46:41 +0200 | |
commit | 3e85c8c4859384b2e7860512dee265c8d18ec370 (patch) | |
tree | 7651bef4ad238b7146bfcac02f06ae99e39c6046 /dev-db/postgis | |
parent | x11-terms/xfce4-terminal: Bump to 0.6.90, early GTK+3 release (diff) | |
download | gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.gz gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.bz2 gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.zip |
dev-db/*: remove unused patches.
Squash all commit messages into a single one.
Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-db/postgis')
-rw-r--r-- | dev-db/postgis/files/postgis-2.0-ldflags.patch | 26 | ||||
-rw-r--r-- | dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch | 99 |
2 files changed, 0 insertions, 125 deletions
diff --git a/dev-db/postgis/files/postgis-2.0-ldflags.patch b/dev-db/postgis/files/postgis-2.0-ldflags.patch deleted file mode 100644 index f48617cd64a9..000000000000 --- a/dev-db/postgis/files/postgis-2.0-ldflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naurw postgis-2.0.2.orig/loader/Makefile.in postgis-2.0.2/loader/Makefile.in ---- postgis-2.0.2.orig/loader/Makefile.in 2012-03-21 21:36:59.000000000 +0000 -+++ postgis-2.0.2/loader/Makefile.in 2013-01-29 21:44:12.566318760 +0000 -@@ -97,11 +97,11 @@ - - $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) - $(LIBTOOL) --mode=link \ -- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ -+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ - - $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) - $(LIBTOOL) --mode=link \ -- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) - - shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h - $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c -@@ -109,7 +109,7 @@ - $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES) - $(LIBTOOL) --mode=link \ - $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \ -- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -+ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) - - installdir: - @mkdir -p $(DESTDIR)$(bindir) diff --git a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch deleted file mode 100644 index 45c5b07654e3..000000000000 --- a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -Naruw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac ---- postgis-2.0.2.orig/configure.ac 2012-05-17 12:10:04.000000000 +0000 -+++ postgis-2.0.2/configure.ac 2013-02-11 11:57:06.733323130 +0000 -@@ -701,57 +701,14 @@ - dnl Detect if json-c installed - dnl =========================================================================== - --HAVE_JSON=no --AC_SUBST([HAVE_JSON]) -- --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 -ljson" -- 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], [json_object_get], [HAVE_JSON=yes], [], []) --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]) -- if test "x$JSON_LDFLAGS" = "x"; then -- JSON_LDFLAGS="-ljson" -- fi --fi -+ ], -+ [HAVE_JSON=no]) - --AC_SUBST([JSON_CPPFLAGS]) --AC_SUBST([JSON_LDFLAGS]) -+AC_SUBST([HAVE_JSON]) - - dnl =========================================================================== - dnl Detect GTK+2.0 for GUI -@@ -842,10 +799,10 @@ - AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics]) - - --CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS" -+CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CFLAGS $XML2_CPPFLAGS" - dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS]) - --SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS" -+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS" - AC_SUBST([SHLIB_LINK]) - dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK]) - -diff -Naruw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c ---- postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c 2012-12-03 16:18:33.000000000 +0000 -+++ postgis-2.0.2/postgis/lwgeom_in_geojson.c 2013-02-11 12:09:29.017167709 +0000 -@@ -28,8 +28,8 @@ - #ifdef HAVE_LIBJSON - - #include "lwgeom_export.h" --#include <json/json.h> --#include <json/json_object_private.h> -+#include <json.h> -+#include <json_object_private.h> - - /* Prototype */ - LWGEOM* parse_geojson(json_object *geojson, bool *hasz, int *root_srid); -@@ -556,4 +556,3 @@ - PG_RETURN_POINTER(geom); - #endif - } -- |