Date: Wednesday, December 27, 2017 @ 11:16:43 Author: jelle Revision: 276213
archrelease: copy trunk to community-staging-x86_64 Added: postgis/repos/community-staging-x86_64/PKGBUILD (from rev 276212, postgis/trunk/PKGBUILD) postgis/repos/community-staging-x86_64/json-0.13-compatibility.patch (from rev 276212, postgis/trunk/json-0.13-compatibility.patch) postgis/repos/community-staging-x86_64/postgis.changelog (from rev 276212, postgis/trunk/postgis.changelog) Deleted: postgis/repos/community-staging-x86_64/PKGBUILD postgis/repos/community-staging-x86_64/json-0.13-compatibility.patch postgis/repos/community-staging-x86_64/postgis.changelog -------------------------------+ PKGBUILD | 74 +++++++-------- json-0.13-compatibility.patch | 88 +++++++++--------- postgis.changelog | 190 ++++++++++++++++++++-------------------- 3 files changed, 176 insertions(+), 176 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-27 11:16:33 UTC (rev 276212) +++ PKGBUILD 2017-12-27 11:16:43 UTC (rev 276213) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=postgis -pkgver=2.4.2 -pkgrel=1 -pkgdesc="Adds support for geographic objects to PostgreSQL" -arch=('x86_64') -url="http://postgis.net/" -license=('GPL') -depends=('postgresql' 'gdal' 'json-c' 'proj' 'protobuf-c') -changelog=$pkgname.changelog -options=('!makeflags') -source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz - json-0.13-compatibility.patch) -sha256sums=('23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9' - 'a7d3a6005cf776d69dc6df0fc4f31a366049487fcde7939a1849e724d0d78c36') - -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i $srcdir/json-0.13-compatibility.patch -} - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install -} Copied: postgis/repos/community-staging-x86_64/PKGBUILD (from rev 276212, postgis/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-27 11:16:43 UTC (rev 276213) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=postgis +pkgver=2.4.2 +pkgrel=2 +pkgdesc="Adds support for geographic objects to PostgreSQL" +arch=('x86_64') +url="http://postgis.net/" +license=('GPL') +depends=('postgresql' 'gdal' 'json-c' 'proj' 'protobuf-c') +changelog=$pkgname.changelog +options=('!makeflags') +source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz + json-0.13-compatibility.patch) +sha256sums=('23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9' + 'a7d3a6005cf776d69dc6df0fc4f31a366049487fcde7939a1849e724d0d78c36') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i $srcdir/json-0.13-compatibility.patch +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} Deleted: json-0.13-compatibility.patch =================================================================== --- json-0.13-compatibility.patch 2017-12-27 11:16:33 UTC (rev 276212) +++ json-0.13-compatibility.patch 2017-12-27 11:16:43 UTC (rev 276213) @@ -1,44 +0,0 @@ -From ccb7b1c48b26256a81a264baeb4ab9d06cf7221e Mon Sep 17 00:00:00 2001 -From: Darafei Praliaskouski <m...@komzpa.net> -Date: Sat, 16 Dec 2017 10:40:06 +0000 -Subject: [PATCH] Do not include private header for json-c >= 0.13 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Patch by Björn Esser - -Closes #3942 -Closes https://github.com/postgis/postgis/pull/173 - - - -git-svn-id: http://svn.osgeo.org/postgis/trunk@16155 b70326c6-7e19-0410-871a-916f4a2858ee ---- - liblwgeom/lwin_geojson.c | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c -index 749d03374..ef907ee79 100644 ---- a/liblwgeom/lwin_geojson.c -+++ b/liblwgeom/lwin_geojson.c -@@ -31,13 +31,19 @@ - - #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */ - -+#define JSON_C_VERSION_013 (13 << 8) -+ - #ifdef HAVE_LIBJSON_C - #include <json-c/json.h> -+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 - #include <json-c/json_object_private.h> -+#endif - #else - #include <json/json.h> -+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 - #include <json/json_object_private.h> - #endif -+#endif - - #ifndef JSON_C_VERSION - /* Adds support for libjson < 0.10 */ Copied: postgis/repos/community-staging-x86_64/json-0.13-compatibility.patch (from rev 276212, postgis/trunk/json-0.13-compatibility.patch) =================================================================== --- json-0.13-compatibility.patch (rev 0) +++ json-0.13-compatibility.patch 2017-12-27 11:16:43 UTC (rev 276213) @@ -0,0 +1,44 @@ +From ccb7b1c48b26256a81a264baeb4ab9d06cf7221e Mon Sep 17 00:00:00 2001 +From: Darafei Praliaskouski <m...@komzpa.net> +Date: Sat, 16 Dec 2017 10:40:06 +0000 +Subject: [PATCH] Do not include private header for json-c >= 0.13 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch by Björn Esser + +Closes #3942 +Closes https://github.com/postgis/postgis/pull/173 + + + +git-svn-id: http://svn.osgeo.org/postgis/trunk@16155 b70326c6-7e19-0410-871a-916f4a2858ee +--- + liblwgeom/lwin_geojson.c | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c +index 749d03374..ef907ee79 100644 +--- a/liblwgeom/lwin_geojson.c ++++ b/liblwgeom/lwin_geojson.c +@@ -31,13 +31,19 @@ + + #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */ + ++#define JSON_C_VERSION_013 (13 << 8) ++ + #ifdef HAVE_LIBJSON_C + #include <json-c/json.h> ++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 + #include <json-c/json_object_private.h> ++#endif + #else + #include <json/json.h> ++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 + #include <json/json_object_private.h> + #endif ++#endif + + #ifndef JSON_C_VERSION + /* Adds support for libjson < 0.10 */ Deleted: postgis.changelog =================================================================== --- postgis.changelog 2017-12-27 11:16:33 UTC (rev 276212) +++ postgis.changelog 2017-12-27 11:16:43 UTC (rev 276213) @@ -1,95 +0,0 @@ -2017-11-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.4.2-1 - -2017-11-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.4.1-2 postgresql 10.1 rebuild, FS#56296 + FS#56266 fix - -2017-10-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.4.1-1 - -2017-10-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.4.0-1 - -2017-07-03 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.3.3-1 - -2017-03-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.3.2-1 - -2016-12-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.3.1-1 - -2016-11-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.3.0-2 postgresql 9.6.1 rebuild - -2016-09-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.3.0-1 - -2016-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.2.2-2 proj 4.9.3 rebuild - -2016-05-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.2.2-1 - -2016-01-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.2.1-2 postgresql 9.5 rebuild - -2016-01-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.2.1-1 - -2015-10-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.2.0-1 - -2015-09-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.8-1 - -2015-06-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.5-2 gdal 2.0.0 rebuild - -2015-03-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.5-2 proj soname rebuild - -2015-01-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.5-1 - -2014-09-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.4-1 - -2014-05-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.3-1 - -2014-04-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.2-1 - -2013-11-11 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.1.1-1 - -2013-08-22 Maxime Gauduin <aluc...@gmail.com> - * postgis-2.1.0-1 - * Fixes FS#35816 - -2013-06-15 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.0.3-1 - -2013-01-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * postgis-2.0.2-1 - -2012-09-24 Dan McGee <d...@archlinux.org> - * Rebuild for PostgreSQL 9.2.x - * Update to minor release 2.0.1 - -2012-05-31 Andrea Scarpino <and...@archlinux.org> - * Add JSON-C support - * Build utils (FS#25836) - -2012-05-31 Andrea Scarpino <and...@archlinux.org> - * Update to major release 2.0.0-1 - -2011-10-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * FS#26159 fix in postgis-1.5.3-2 - -2010-10-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * Update to major release 1.5.2 - -2010-03-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * Update to major release 1.5.1 Copied: postgis/repos/community-staging-x86_64/postgis.changelog (from rev 276212, postgis/trunk/postgis.changelog) =================================================================== --- postgis.changelog (rev 0) +++ postgis.changelog 2017-12-27 11:16:43 UTC (rev 276213) @@ -0,0 +1,95 @@ +2017-11-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.4.2-1 + +2017-11-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.4.1-2 postgresql 10.1 rebuild, FS#56296 + FS#56266 fix + +2017-10-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.4.1-1 + +2017-10-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.4.0-1 + +2017-07-03 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.3.3-1 + +2017-03-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.3.2-1 + +2016-12-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.3.1-1 + +2016-11-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.3.0-2 postgresql 9.6.1 rebuild + +2016-09-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.3.0-1 + +2016-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.2.2-2 proj 4.9.3 rebuild + +2016-05-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.2.2-1 + +2016-01-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.2.1-2 postgresql 9.5 rebuild + +2016-01-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.2.1-1 + +2015-10-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.2.0-1 + +2015-09-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.8-1 + +2015-06-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.5-2 gdal 2.0.0 rebuild + +2015-03-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.5-2 proj soname rebuild + +2015-01-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.5-1 + +2014-09-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.4-1 + +2014-05-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.3-1 + +2014-04-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.2-1 + +2013-11-11 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.1.1-1 + +2013-08-22 Maxime Gauduin <aluc...@gmail.com> + * postgis-2.1.0-1 + * Fixes FS#35816 + +2013-06-15 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.0.3-1 + +2013-01-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * postgis-2.0.2-1 + +2012-09-24 Dan McGee <d...@archlinux.org> + * Rebuild for PostgreSQL 9.2.x + * Update to minor release 2.0.1 + +2012-05-31 Andrea Scarpino <and...@archlinux.org> + * Add JSON-C support + * Build utils (FS#25836) + +2012-05-31 Andrea Scarpino <and...@archlinux.org> + * Update to major release 2.0.0-1 + +2011-10-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * FS#26159 fix in postgis-1.5.3-2 + +2010-10-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Update to major release 1.5.2 + +2010-03-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Update to major release 1.5.1