[arch-commits] Commit in postgis/trunk (PKGBUILD fix_json_012.patch)

[Anatol Pomozov]

    Date: Saturday, May 31, 2014 @ 03:24:30
  Author: anatolik
Revision: 112288

upgpkg: postgis 2.1.3-2

Fix json-c compilation issue. FS#40528

Added:
  postgis/trunk/fix_json_012.patch
Modified:
  postgis/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   15 ++++++++++++---
 fix_json_012.patch |   23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-30 22:38:11 UTC (rev 112287)
+++ PKGBUILD	2014-05-31 01:24:30 UTC (rev 112288)
@@ -5,7 +5,7 @@
 
 pkgname=postgis
 pkgver=2.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Adds support for geographic objects to PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://postgis.net/"
@@ -12,9 +12,18 @@
 license=('GPL')
 depends=('postgresql' 'gdal' 'json-c')
 changelog=$pkgname.changelog
-source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('c17812aa4bb86ed561dfc65cb42ab45176b94e0620de183a4bbd773d6d876ec1')
+source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz
+        fix_json_012.patch)
+sha256sums=('c17812aa4bb86ed561dfc65cb42ab45176b94e0620de183a4bbd773d6d876ec1'
+            '68fd36730baf96341744c03582b0e8af309328ba79bb59fa981a515299cc1bda')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Compilation failure from upstream. FS#40528
+  patch -p1 < "$srcdir"/fix_json_012.patch 
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: fix_json_012.patch
===================================================================
--- fix_json_012.patch	                        (rev 0)
+++ fix_json_012.patch	2014-05-31 01:24:30 UTC (rev 112288)
@@ -0,0 +1,23 @@
+diff -N -aur postgis-2.1.3.orig/liblwgeom/lwin_geojson.c postgis-2.1.3/liblwgeom/lwin_geojson.c
+--- postgis-2.1.3.orig/liblwgeom/lwin_geojson.c	2014-05-29 12:27:08.842806693 +0000
++++ postgis-2.1.3/liblwgeom/lwin_geojson.c	2014-05-29 12:27:24.349473709 +0000
+@@ -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);