[arch-commits] Commit in postgis/trunk (3 files)

[Jaroslav Lichtblau]

    Date: Saturday, May 12, 2018 @ 08:35:33
  Author: jlichtblau
Revision: 321016

upgpkg: postgis 2.4.4-1 - new upstream release

Modified:
  postgis/trunk/PKGBUILD
  postgis/trunk/postgis.changelog
Deleted:
  postgis/trunk/json-0.13-compatibility.patch

-------------------------------+
 PKGBUILD                      |   13 ++---------
 json-0.13-compatibility.patch |   44 ----------------------------------------
 postgis.changelog             |    6 +++++
 3 files changed, 9 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-12 08:19:17 UTC (rev 321015)
+++ PKGBUILD	2018-05-12 08:35:33 UTC (rev 321016)
@@ -4,7 +4,7 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=postgis
-pkgver=2.4.3
+pkgver=2.4.4
 pkgrel=1
 pkgdesc="Adds support for geographic objects to PostgreSQL"
 arch=('x86_64')
@@ -13,16 +13,9 @@
 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=('ea5374c5db6b645ba5628ddcb08f71d3b3d90a464d366b4e1d20d5a268bde4b9'
-            'a7d3a6005cf776d69dc6df0fc4f31a366049487fcde7939a1849e724d0d78c36')
+source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('0663efb589210d5048d95c817e5cf29552ec8180e16d4c6ef56c94255faca8c2')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/json-0.13-compatibility.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 

Deleted: json-0.13-compatibility.patch
===================================================================
--- json-0.13-compatibility.patch	2018-05-12 08:19:17 UTC (rev 321015)
+++ json-0.13-compatibility.patch	2018-05-12 08:35:33 UTC (rev 321016)
@@ -1,44 +0,0 @@
-From ccb7b1c48b26256a81a264baeb4ab9d06cf7221e Mon Sep 17 00:00:00 2001
-From: Darafei Praliaskouski <me at 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 */

Modified: postgis.changelog
===================================================================
--- postgis.changelog	2018-05-12 08:19:17 UTC (rev 321015)
+++ postgis.changelog	2018-05-12 08:35:33 UTC (rev 321016)
@@ -1,3 +1,9 @@
+2018-05-12 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+    * postgis-2.4.4-1
+
+2018-01-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+    * postgis-2.4.3-1
+
 2017-11-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
     * postgis-2.4.2-1