3.4.2-1: upstream update; disable minimal Gtk2 GUI (out of scope of this pkg)

4 files changed, 91 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9308ecd31ed1..ffe2f8cc8de9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,31 @@
-# Generated by mksrcinfo v8
-# Mon Dec  5 21:17:16 UTC 2016
 pkgbase = postgis-sfcgal
-	pkgdesc = Adds support for geographic objects to PostgreSQL and includes SFCGAL support for experimental 3D functions
-	pkgver = 2.3.1
+	pkgdesc = A spatial database extender for PostgreSQL, with SFCGAL support
+	pkgver = 3.4.2
 	pkgrel = 1
-	url = http://postgis.net/
-	changelog = postgis-sfcgal.changelog
+	url = https://postgis.net/
 	arch = i686
 	arch = x86_64
-	license = GPL
-	depends = postgresql
+	license = GPL-3.0-or-later
+	license = LicenseRef-PostGIS
+	makedepends = clang
+	makedepends = llvm
+	makedepends = postgresql
+	depends = gcc-libs
 	depends = gdal
 	depends = geos
+	depends = glibc
 	depends = json-c
-	depends = sfcgal
 	depends = libxml2
-	depends = libxslt
-	provides = postgis=2.3.1
+	depends = pcre2
+	depends = postgresql-libs
+	depends = proj
+	depends = protobuf-c
+	depends = sfcgal
+	depends = sh
+	optdepends = perl: for contrib script postgis_restore.pl
+	provides = postgis=3.4.2
 	conflicts = postgis
-	source = http://download.osgeo.org/postgis/source/postgis-2.3.1.tar.gz
-	md5sums = 29d78ebf4542af94ad518508a27d47af
+	source = https://download.osgeo.org/postgis/source/postgis-3.4.2.tar.gz
+	b2sums = 30951950ae24ae0e0432658ef09ec95ffcf0ef377f79e45fb302f20b40d773c9d551d4ac2a07eab4f743ebeff2aae4730c8b7c2516c36a17f44a1410fbdc3069
 
 pkgname = postgis-sfcgal
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..058ba2318df1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# based on https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+
+*/
+*.orig
+*.bak
+*.backup
+*.kate-swp
+.directory
diff --git a/PKGBUILD b/PKGBUILD
index 67bd19e197e4..31030c87b6fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,70 @@
-# Maintainer: SaultDon <sault.don gmail>
+# Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu >
+# Contributor: SaultDon <sault.don gmail>
+# Contributor: Bruno Pagani <archange@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
+
 pkgname=postgis-sfcgal
 _pkgname=${pkgname%-sfcgal}
-pkgver=2.3.1
+pkgver=3.4.2
 pkgrel=1
-pkgdesc="Adds support for geographic objects to PostgreSQL and includes SFCGAL support for experimental 3D functions"
+pkgdesc='A spatial database extender for PostgreSQL, with SFCGAL support'
 arch=('i686' 'x86_64')
-url="http://postgis.net/"
-license=('GPL')
-depends=('postgresql' 'gdal' 'geos' 'json-c' 'sfcgal' 'libxml2' 'libxslt')
-changelog=$pkgname.changelog
-provides=("$_pkgname=$pkgver")
-conflicts=($_pkgname)
-source=("http://download.osgeo.org/postgis/source/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('29d78ebf4542af94ad518508a27d47af')
+url='https://postgis.net/'
+license=(
+  'GPL-3.0-or-later'    # PostGIS is GPL-2.0-or-later, but pkg has to be GPL3+ if linked with GPL3+ code like cgal (via sfcgal)
+  'LicenseRef-PostGIS'
+)
+depends=(
+  'gcc-libs'
+  'gdal'
+  'geos'
+  'glibc'
+  'json-c'
+  'libxml2'
+  'pcre2'
+  'postgresql-libs'
+  'proj'
+  'protobuf-c'
+  'sfcgal'
+  'sh'
+)
+makedepends=(
+  'clang'
+  'llvm'
+  'postgresql'
+)
+optdepends=('perl: for contrib script postgis_restore.pl')
+provides=("${_pkgname}=${pkgver}")
+conflicts=(${_pkgname})
+source=("https://download.osgeo.org/postgis/source/${_pkgname}-${pkgver}.tar.gz")
+b2sums=('30951950ae24ae0e0432658ef09ec95ffcf0ef377f79e45fb302f20b40d773c9d551d4ac2a07eab4f743ebeff2aae4730c8b7c2516c36a17f44a1410fbdc3069')
+
+prepare() {
+  cd "${_pkgname}-${pkgver}"
+  autoreconf -vfi
+}
 
 build() {
-  cd ${_pkgname}-${pkgver}
+  cd "${_pkgname}-${pkgver}"
+
+  ./configure \
+    --prefix=/usr \
+    --libexecdir="/usr/lib/${_pkgname}" \
+    --sysconfdir=/etc \
+    --sharedstatedir="/var/lib/${_pkgname}" \
+    --localstatedir=/var \
+    --enable-static=no \
+    --enable-lto \
+    --with-sfcgal
 
-  ./autogen.sh
-  ./configure --prefix=/usr --with-raster --with-gdalconfig=/usr/bin/gdal-config --with-gui
   make
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}
+  cd "${_pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+  install -Dm644 LICENSE.TXT -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/postgis-sfcgal.changelog b/postgis-sfcgal.changelog
deleted file mode 100644
index 3e3c8a275192..000000000000
--- a/postgis-sfcgal.changelog
+++ /dev/null
@@ -1,55 +0,0 @@
-2016-12-5 SaultDon <sault.don gmail>
-    * postgis 2.3.1-1
-
-2015-11-30 SaultDon <sault.don gmail>
-    * postgis 2.2.0-1
-
-2015-07-07 SaultDon <sault.don gmail>
-    * postgis 2.1.8-1
-
-2015-05-12 SaultDon <sault.don gmail>
-    * postgis 2.1.7-1
-
-2015-03-24 SaultDon <sault.don gmail>
-    * postgis 2.1.6-1
-
-2014-09-11 SaultDon <sault.don gmail>
-    * postgis 2.1.4-1
-    - removed json-c patch and upgraded to stable release 2.1.4
-
-2014-05-29 SaultDon <sault.don gmail>
-    * postgis 2.1.3-1
-    - added json-c patch for compiling against update json-c >= 0.11
-
-2013-11-09 SaultDon <sault.don gmail>
-    * postgis-2.1.1-1
-
-2013-08-22 Maxime Gauduin <alucryd@gmail.com>
-    * postgis-2.1.0-1
-    * Fixes FS#35816
-
-2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-    * postgis-2.0.3-1
-
-2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-    * postgis-2.0.2-1
-
-2012-09-24 Dan McGee <dan@archlinux.org>
-    * Rebuild for PostgreSQL 9.2.x
-    * Update to minor release 2.0.1
-
-2012-05-31 Andrea Scarpino <andrea@archlinux.org>
-    * Add JSON-C support
-    * Build utils (FS#25836)
-
-2012-05-31 Andrea Scarpino <andrea@archlinux.org>
-    * Update to major release 2.0.0-1
-
-2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-    * FS#26159 fix in postgis-1.5.3-2
-
-2010-10-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-    * Update to major release 1.5.2
-
-2010-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-    * Update to major release 1.5.1