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

[Jaroslav Lichtblau]

Date: Friday, September 12, 2014 @ 06:44:33
  Author: jlichtblau
Revision: 118843

upgpkg: postgis 2.1.4-1

Modified:
  postgis/trunk/PKGBUILD
  postgis/trunk/postgis.changelog
Deleted:
  postgis/trunk/fix_json_012.patch

+
 PKGBUILD   |   17 -
 fix_json_012.patch |   23 ---
 postgis.changelog  |3 +++
 3 files changed, 7 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-12 04:32:29 UTC (rev 118842)
+++ PKGBUILD2014-09-12 04:44:33 UTC (rev 118843)
@@ -4,8 +4,8 @@
 # Contributor: William Rea sillywi...@gmail.com
 
 pkgname=postgis
-pkgver=2.1.3
-pkgrel=2
+pkgver=2.1.4
+pkgrel=1
 pkgdesc=Adds support for geographic objects to PostgreSQL
 arch=('i686' 'x86_64')
 url=http://postgis.net/;
@@ -12,18 +12,9 @@
 license=('GPL')
 depends=('postgresql' 'gdal' 'json-c')
 changelog=$pkgname.changelog
-source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz
-fix_json_012.patch)
-sha256sums=('c17812aa4bb86ed561dfc65cb42ab45176b94e0620de183a4bbd773d6d876ec1'
-'68fd36730baf96341744c03582b0e8af309328ba79bb59fa981a515299cc1bda')
+source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('cd73c2a38428c8736f6cae73b955aee0bd42f9ca4fd8d93c1af464524cb100fc')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # Compilation failure from upstream. FS#40528
-  patch -p1  $srcdir/fix_json_012.patch 
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 

Deleted: fix_json_012.patch
===
--- fix_json_012.patch  2014-09-12 04:32:29 UTC (rev 118842)
+++ fix_json_012.patch  2014-09-12 04:44:33 UTC (rev 118843)
@@ -1,23 +0,0 @@
-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.c2014-05-29 
12:27:08.842806693 +
-+++ postgis-2.1.3/liblwgeom/lwin_geojson.c 2014-05-29 12:27:24.349473709 
+
-@@ -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);

Modified: postgis.changelog
===
--- postgis.changelog   2014-09-12 04:32:29 UTC (rev 118842)
+++ postgis.changelog   2014-09-12 04:44:33 UTC (rev 118843)
@@ -1,3 +1,6 @@
+2014-09-12 Jaroslav Lichtblau dragonl...@aur.archlinux.org
+* postgis-2.1.4-1
+
 2014-05-25 Jaroslav Lichtblau dragonl...@aur.archlinux.org
 * postgis-2.1.3-1
 

[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
===
--- PKGBUILD2014-05-30 22:38:11 UTC (rev 112287)
+++ PKGBUILD2014-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.c2014-05-29 
12:27:08.842806693 +
 postgis-2.1.3/liblwgeom/lwin_geojson.c 2014-05-29 12:27:24.349473709 
+
+@@ -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);