Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3cd806094781b2692bac74aee0d2ac38bc35f1d7
commit 3cd806094781b2692bac74aee0d2ac38bc35f1d7 Author: James Buren <[email protected]> Date: Tue Jun 24 13:56:52 2014 -0500 postgis-2.1.3-2-x86_64 * rebuild with json-c diff --git a/source/devel-extra/postgis/FrugalBuild b/source/devel-extra/postgis/FrugalBuild index 057a701..1a7e727 100644 --- a/source/devel-extra/postgis/FrugalBuild +++ b/source/devel-extra/postgis/FrugalBuild @@ -3,19 +3,21 @@ pkgname=postgis pkgver=2.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Adds support for geographic objects to PostgreSQL including the experimental PostGis RASTER type" url="http://trac.osgeo.org/postgis"; -depends=('postgresql' 'gdal' 'json-c' 'libxml2') +depends=('postgresql' 'gdal' 'json-c>=0.12' 'libxml2') makedepends=('proj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.osgeo.org/postgis/source | Flasttar" -source=(http://download.osgeo.org/$pkgname/source/$pkgname-$pkgver.tar.gz) -sha1sums=('984bc23603af8c66f4f0b2d3aa7bb75b4c9e3191') +source=(http://download.osgeo.org/$pkgname/source/$pkgname-$pkgver.tar.gz jsonc.patch) +sha1sums=('984bc23603af8c66f4f0b2d3aa7bb75b4c9e3191' \ + 'b5f651e69d493f850f2122d8876abffb4df46768') build() { Fcd + Fpatchall sh ./autogen.sh Fconf --with-raster make || Fdie diff --git a/source/devel-extra/postgis/jsonc.patch b/source/devel-extra/postgis/jsonc.patch new file mode 100644 index 0000000..b681e57 --- /dev/null +++ b/source/devel-extra/postgis/jsonc.patch @@ -0,0 +1,51 @@ +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2014-05-05 03:12:08.000000000 -0500 ++++ b/configure.ac 2014-06-24 13:11:17.157901619 -0500 +@@ -767,8 +767,8 @@ + 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 \ ++ dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json-c/json.h ++ if test ! -e "${JSONDIR}/include/json-c/json.h" -o \ + ! \( -e "${JSONDIR}/lib/libjson.so" -o \ + -e "${JSONDIR}/lib/libjson.dll" -o \ + -e "${JSONDIR}/lib/libjson.dylib" -o \ +@@ -785,11 +785,11 @@ + fi + fi + +-dnl Check that we can find the json/json.h header file ++dnl Check that we can find the json-c/json.h header file + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$JSON_CPPFLAGS" + AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes], [ +- AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])]) ++ AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes], [])]) + CPPFLAGS="$CPPFLAGS_SAVE" + + dnl Ensure we can link against libjson +diff -ur a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c +--- a/liblwgeom/lwin_geojson.c 2014-04-03 16:53:20.000000000 -0500 ++++ b/liblwgeom/lwin_geojson.c 2014-06-24 13:54:41.744805757 -0500 +@@ -17,8 +17,8 @@ + + #ifdef HAVE_LIBJSON + +-#include <json/json.h> +-#include <json/json_object_private.h> ++#include <json-c/json.h> ++#include <json-c/json_object_private.h> + #include <string.h> + + static void geojson_lwerror(char *msg, int error_code) +@@ -510,7 +510,7 @@ + if( jstok->err != json_tokener_success) + { + char err[256]; +- snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset); ++ snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset); + json_tokener_free(jstok); + json_object_put(poObj); + geojson_lwerror(err, 1); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
