From 8f0c006e536f8e781a2b9b4aa4da19a0d25a835c Mon Sep 17 00:00:00 2001
From: Jason Plum <max@warheads.net>
Date: Thu, 17 Sep 2015 19:01:48 -0400
Subject: [PATCH] community/gdal to 2.0.0-1

---
 community/gdal/PKGBUILD                       | 23 +++++++++----------
 ...nstall.patch => gdal-python-install.patch} |  0
 community/gdal/gdal.changelog                 |  6 +++++
 community/gdal/poppler-0.31.patch             | 12 ----------
 4 files changed, 17 insertions(+), 24 deletions(-)
 rename community/gdal/{gdal-1.5.1-python-install.patch => gdal-python-install.patch} (100%)
 delete mode 100644 community/gdal/poppler-0.31.patch

diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index c1676ec9e..de2f11293 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -8,29 +8,28 @@
 #  - use uname in path in removing rpath in packaging
 
 pkgname=gdal
-pkgver=1.11.2
-pkgrel=5
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64')
 url="http://www.gdal.org/"
 license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf'
+         'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
 makedepends=('perl' 'swig' 'chrpath' 'doxygen')
 optdepends=('postgresql: postgresql database support'
             'mariadb: mariadb database support'
             'perl:  perl binding support')
+options=('!emptydirs')
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        gdal-1.5.1-python-install.patch
-        poppler-0.31.patch)
+        gdal-python-install.patch)
 sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
-            '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
-            '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6')
+            '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
-  patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
-  patch -Np1 -i "${srcdir}"/poppler-0.31.patch
+  patch -Np0 -i "${srcdir}"/gdal-python-install.patch
 
 # python2 fixes
   sed -i 's_python python1.5_python2 python python1.5_' configure
@@ -50,8 +49,8 @@ build() {
   export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
 
   ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
-              --with-geotiff --with-mysql --with-python --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png --with-spatialite
+              --with-geotiff --with-mysql --with-python --with-curl --with-hdf5 \
+              --with-perl --with-geos --with-png --with-spatialite
 
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
@@ -67,7 +66,7 @@ package () {
   make DESTDIR="${pkgdir}" install-man
 
 # install license
-  install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
 #FS15477 clean up junks
   rm -f "${pkgdir}"/usr/bin/*.dox
diff --git a/community/gdal/gdal-1.5.1-python-install.patch b/community/gdal/gdal-python-install.patch
similarity index 100%
rename from community/gdal/gdal-1.5.1-python-install.patch
rename to community/gdal/gdal-python-install.patch
diff --git a/community/gdal/gdal.changelog b/community/gdal/gdal.changelog
index 92918fc79..01d190620 100644
--- a/community/gdal/gdal.changelog
+++ b/community/gdal/gdal.changelog
@@ -1,3 +1,9 @@
+2015-06-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+   * gdal 2.0.0
+
+2015-03-01 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+   * gdal 1.11.2-2 poppler 0.31.0 rebuild
+
 2014-12-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
 	* gdal 1.11.1-5 FS#43193 fix
 
diff --git a/community/gdal/poppler-0.31.patch b/community/gdal/poppler-0.31.patch
deleted file mode 100644
index fff23461f..000000000
--- a/community/gdal/poppler-0.31.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gdal-1.11.2/frmts/pdf/pdfdataset.cpp gdal-1.11.2a/frmts/pdf/pdfdataset.cpp
---- gdal-1.11.2/frmts/pdf/pdfdataset.cpp	2015-02-10 13:11:19.000000000 +0100
-+++ gdal-1.11.2a/frmts/pdf/pdfdataset.cpp	2015-03-02 18:38:25.170155277 +0100
-@@ -113,7 +113,7 @@
-                          GBool allowAntialiasA = gTrue) :
-                 SplashOutputDev(colorModeA, bitmapRowPadA,
-                                 reverseVideoA, paperColorA,
--                                bitmapTopDownA, allowAntialiasA),
-+                                bitmapTopDownA),
-                 bEnableVector(TRUE),
-                 bEnableText(TRUE),
-                 bEnableBitmap(TRUE) {}