[arch-commits] Commit in postgis/repos (8 files)
Anatol Pomozov
anatolik at nymeria.archlinux.org
Sat May 31 01:26:12 UTC 2014
Date: Saturday, May 31, 2014 @ 03:26:11
Author: anatolik
Revision: 112290
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
postgis/repos/community-testing-i686/
postgis/repos/community-testing-i686/PKGBUILD
(from rev 112288, postgis/trunk/PKGBUILD)
postgis/repos/community-testing-i686/fix_json_012.patch
(from rev 112288, postgis/trunk/fix_json_012.patch)
postgis/repos/community-testing-i686/postgis.changelog
(from rev 112288, postgis/trunk/postgis.changelog)
postgis/repos/community-testing-x86_64/
postgis/repos/community-testing-x86_64/PKGBUILD
(from rev 112288, postgis/trunk/PKGBUILD)
postgis/repos/community-testing-x86_64/fix_json_012.patch
(from rev 112288, postgis/trunk/fix_json_012.patch)
postgis/repos/community-testing-x86_64/postgis.changelog
(from rev 112288, postgis/trunk/postgis.changelog)
---------------------------------------------+
community-testing-i686/PKGBUILD | 40 ++++++++++++++++++++++++++
community-testing-i686/fix_json_012.patch | 23 ++++++++++++++
community-testing-i686/postgis.changelog | 38 ++++++++++++++++++++++++
community-testing-x86_64/PKGBUILD | 40 ++++++++++++++++++++++++++
community-testing-x86_64/fix_json_012.patch | 23 ++++++++++++++
community-testing-x86_64/postgis.changelog | 38 ++++++++++++++++++++++++
6 files changed, 202 insertions(+)
Copied: postgis/repos/community-testing-i686/PKGBUILD (from rev 112288, postgis/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-05-31 01:26:11 UTC (rev 112290)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=postgis
+pkgver=2.1.3
+pkgrel=2
+pkgdesc="Adds support for geographic objects to PostgreSQL"
+arch=('i686' 'x86_64')
+url="http://postgis.net/"
+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')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Compilation failure from upstream. FS#40528
+ patch -p1 < "$srcdir"/fix_json_012.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Copied: postgis/repos/community-testing-i686/fix_json_012.patch (from rev 112288, postgis/trunk/fix_json_012.patch)
===================================================================
--- community-testing-i686/fix_json_012.patch (rev 0)
+++ community-testing-i686/fix_json_012.patch 2014-05-31 01:26:11 UTC (rev 112290)
@@ -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);
Copied: postgis/repos/community-testing-i686/postgis.changelog (from rev 112288, postgis/trunk/postgis.changelog)
===================================================================
--- community-testing-i686/postgis.changelog (rev 0)
+++ community-testing-i686/postgis.changelog 2014-05-31 01:26:11 UTC (rev 112290)
@@ -0,0 +1,38 @@
+2014-05-25 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.1.3-1
+
+2014-04-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.1.2-1
+
+2013-11-11 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.1.1-1
+
+2013-08-22 Maxime Gauduin <alucryd at gmail.com>
+ * postgis-2.1.0-1
+ * Fixes FS#35816
+
+2013-06-15 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.0.3-1
+
+2013-01-05 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.0.2-1
+
+2012-09-24 Dan McGee <dan at archlinux.org>
+ * Rebuild for PostgreSQL 9.2.x
+ * Update to minor release 2.0.1
+
+2012-05-31 Andrea Scarpino <andrea at archlinux.org>
+ * Add JSON-C support
+ * Build utils (FS#25836)
+
+2012-05-31 Andrea Scarpino <andrea at archlinux.org>
+ * Update to major release 2.0.0-1
+
+2011-10-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * FS#26159 fix in postgis-1.5.3-2
+
+2010-10-30 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Update to major release 1.5.2
+
+2010-03-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Update to major release 1.5.1
Copied: postgis/repos/community-testing-x86_64/PKGBUILD (from rev 112288, postgis/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-05-31 01:26:11 UTC (rev 112290)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=postgis
+pkgver=2.1.3
+pkgrel=2
+pkgdesc="Adds support for geographic objects to PostgreSQL"
+arch=('i686' 'x86_64')
+url="http://postgis.net/"
+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')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Compilation failure from upstream. FS#40528
+ patch -p1 < "$srcdir"/fix_json_012.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Copied: postgis/repos/community-testing-x86_64/fix_json_012.patch (from rev 112288, postgis/trunk/fix_json_012.patch)
===================================================================
--- community-testing-x86_64/fix_json_012.patch (rev 0)
+++ community-testing-x86_64/fix_json_012.patch 2014-05-31 01:26:11 UTC (rev 112290)
@@ -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);
Copied: postgis/repos/community-testing-x86_64/postgis.changelog (from rev 112288, postgis/trunk/postgis.changelog)
===================================================================
--- community-testing-x86_64/postgis.changelog (rev 0)
+++ community-testing-x86_64/postgis.changelog 2014-05-31 01:26:11 UTC (rev 112290)
@@ -0,0 +1,38 @@
+2014-05-25 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.1.3-1
+
+2014-04-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.1.2-1
+
+2013-11-11 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.1.1-1
+
+2013-08-22 Maxime Gauduin <alucryd at gmail.com>
+ * postgis-2.1.0-1
+ * Fixes FS#35816
+
+2013-06-15 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.0.3-1
+
+2013-01-05 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * postgis-2.0.2-1
+
+2012-09-24 Dan McGee <dan at archlinux.org>
+ * Rebuild for PostgreSQL 9.2.x
+ * Update to minor release 2.0.1
+
+2012-05-31 Andrea Scarpino <andrea at archlinux.org>
+ * Add JSON-C support
+ * Build utils (FS#25836)
+
+2012-05-31 Andrea Scarpino <andrea at archlinux.org>
+ * Update to major release 2.0.0-1
+
+2011-10-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * FS#26159 fix in postgis-1.5.3-2
+
+2010-10-30 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Update to major release 1.5.2
+
+2010-03-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Update to major release 1.5.1
More information about the arch-commits
mailing list