[packages/postgis] - one more fix for json-c 0.12 - rel 4

baggins baggins at pld-linux.org
Mon Nov 24 07:22:58 CET 2014


commit 9d5295c5f85617750e2d9a9cedfe75102216dce5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 24 07:22:41 2014 +0100

    - one more fix for json-c 0.12
    - rel 4

 json-c-0.12.patch | 9 +++++++++
 postgis.spec      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/postgis.spec b/postgis.spec
index 123ac0b..3f79403 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -10,7 +10,7 @@ Summary:	Geographic Information Systems Extensions to PostgreSQL
 Summary(pl.UTF-8):	Rozszerzenie do PostgreSQL wspomagające Geograficzne Systemy Informacyjne
 Name:		postgis
 Version:	2.1.3
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Applications/Databases
 Source0:	http://download.osgeo.org/postgis/source/%{name}-%{version}%{beta}.tar.gz
diff --git a/json-c-0.12.patch b/json-c-0.12.patch
index 64a30dd..64b6cc8 100644
--- a/json-c-0.12.patch
+++ b/json-c-0.12.patch
@@ -11,3 +11,12 @@
  #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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/postgis.git/commitdiff/9d5295c5f85617750e2d9a9cedfe75102216dce5



More information about the pld-cvs-commit mailing list