Update GDAL version and fix PKGBUILD

8 files changed, 45 insertions, 816 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbeb9e1cbcb7..3477cfa1e4c7 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = gdal-hdf4
 	pkgdesc = A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool: http://github.com/lbusett/MODIStsp)
-	pkgver = 2.3.1
-	pkgrel = 5
+	pkgver = 2.3.2
+	pkgrel = 8.0
 	url = http://www.gdal.org/
-	changelog = gdal.changelog
+	changelog = gdal-hdf4.changelog
 	arch = x86_64
 	license = custom
 	makedepends = perl
@@ -22,32 +22,33 @@ pkgbase = gdal-hdf4
 	depends = libspatialite
 	depends = libtiff
 	depends = netcdf
-	depends = hdf4-nonetcdf
-	depends = hdf4-nonetcdf
+	depends = hdf4
 	depends = openjpeg2
 	depends = poppler
 	depends = cfitsio
 	depends = sqlite
-	depends = libmariadbclient
+	depends = mariadb-libs
 	depends = postgresql-libs
 	depends = xerces-c
 	depends = json-c
 	optdepends = postgresql: postgresql database support
 	optdepends = mariadb: mariadb database support
 	optdepends = perl: perl binding support
+	provides = gdal
+	conflicts = gdal
 	options = !emptydirs
-	source = https://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.xz
-	source = gdal-perl-vendor.patch
-	sha256sums = 9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a
+	source = https://download.osgeo.org/gdal/2.3.2/gdal-2.3.2.tar.xz
+	source = gdal-poppler-0.69.0.patch::https://github.com/OSGeo/gdal/commit/69e0701253.patch
+	source = gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal
+	sha256sums = 3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4
+	sha256sums = cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5
 	sha256sums = a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3
 
 pkgname = gdal-hdf4
-	provides = gdal
-	conflicts = gdal
 
 pkgname = python-gdal-hdf4
 	pkgdesc = Python bindings for GDAL, with support to HDF4 format
-	depends = gdal=2.3.1
+	depends = gdal-hdf4=2.3.2
 	depends = python-numpy
 	optdepends = 
 	provides = python-gdal
@@ -55,7 +56,7 @@ pkgname = python-gdal-hdf4
 
 pkgname = python2-gdal-hdf4
 	pkgdesc = Python 2 bindings for GDAL, with support to HDF4 format
-	depends = gdal=2.3.1
+	depends = gdal-hdf4=2.3.2
 	depends = python2-numpy
 	optdepends = 
 	provides = python2-gdal
diff --git a/PKGBUILD b/PKGBUILD
index 5320763fa2df..1ec7c745067b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Jaroslav Lichtblau <svetlemodry@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,31 +5,41 @@
 # Contributor: Luigi Ranghetti <ggranga@gmail.com>
 
 pkgbase=gdal-hdf4
-pkgname=(gdal-hdf4 python-gdal-hdf4 python2-gdal-hdf4)
 _pkgbase=gdal
-_pkgname=(gdal python-gdal python2-gdal)
-pkgver=2.3.1
-pkgrel=5
+provides=('gdal')
+conflicts=('gdal')
+pkgname=('gdal-hdf4' 'python-gdal-hdf4' 'python2-gdal-hdf4')
+pkgver=2.3.2
+pkgrel=8.0
 pkgdesc="A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool: http://github.com/lbusett/MODIStsp)"
 arch=('x86_64')
 url="http://www.gdal.org/"
 license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg-turbo' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'hdf4-nonetcdf' 'hdf4-nonetcdf'
-         'openjpeg2' 'poppler' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs' 'xerces-c' 'json-c')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg-turbo' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'hdf4'
+         'openjpeg2' 'poppler' 'cfitsio' 'sqlite' 'mariadb-libs' 'postgresql-libs' 'xerces-c' 'json-c')
 makedepends=('perl' 'swig' 'chrpath' 'doxygen' 'python-numpy' 'python2-numpy')
 optdepends=('postgresql: postgresql database support'
             'mariadb: mariadb database support'
             'perl:  perl binding support')
 options=('!emptydirs')
-changelog=$_pkgbase.changelog
+changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
-        gdal-perl-vendor.patch)
-sha256sums=('9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a'
+        gdal-poppler-0.69.0.patch::https://github.com/OSGeo/gdal/commit/69e0701253.patch
+        gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal)
+sha256sums=('3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4'
+            'cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5'
             'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3')
 
 prepare() {
   cd "${srcdir}"/$_pkgbase-$pkgver
 
+# Fix build with poppler >= 0.69.0
+  patch -Np2 -i ../gdal-poppler-0.69.0.patch
+# Fix build with poppler 0.72
+  find frmts/pdf -type f | xargs sed -e 's|GBool|bool|g' -e 's|gFalse|false|g' -e 's|getCString|c_str|g' -i
+# Fix build with poppler 0.73
+  sed -e 's|#include <goo/gtypes.h>|typedef unsigned char Guchar;|' -i frmts/pdf/pdfsdk_headers.h
+
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 
@@ -42,20 +51,20 @@ build() {
   cd "${srcdir}"/$_pkgbase-$pkgver
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
 
+# Ignore const-related errors (remove once fixed upstream)
+  CXXFLAGS+=' -fpermissive'
+
 # bug #23654
   export LDFLAGS="$LDFLAGS -Wl,--as-needed"
 
   ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 --with-geotiff \
-              --with-mysql --with-curl --with-hdf5 --with-hdf4 --with-perl --with-geos \
+              --with-mysql --with-curl --with-hdf5 --with-hdf4=/opt/hdf4 --with-perl --with-geos \
               --with-png --with-poppler --with-spatialite --with-openjpeg
 
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
   sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
 
-# bug: http://osgeo-org.1560.x6.nabble.com/gdal-dev-jpeg2000-jasper-error-compiling-gdal-2-1-from-git-release-branch-td5299100.html
-  sed -i -e 's@uchar@unsigned char@' frmts/jpeg2000/jpeg2000_vsil_io.cpp
-
   make
   make man
 
@@ -65,9 +74,6 @@ build() {
 }
 
 package_gdal-hdf4 () {
-  provides=(gdal)
-  conflicts=(gdal)
-
   cd "${srcdir}"/$_pkgbase-$pkgver
 
   make DESTDIR="${pkgdir}" install
@@ -89,10 +95,10 @@ package_gdal-hdf4 () {
 }
 
 package_python-gdal-hdf4 () {
-  provides=(python-gdal)
-  conflicts=(python-gdal)
   pkgdesc="Python bindings for GDAL, with support to HDF4 format"
-  depends=("gdal=$pkgver" 'python-numpy')
+  provides=("python-gdal")
+  conflicts=("python-gdal")
+  depends=("gdal-hdf4=$pkgver" 'python-numpy')
   optdepends=()
 
   cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
@@ -100,14 +106,14 @@ package_python-gdal-hdf4 () {
   install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
 
   install -dm755 "${pkgdir}"/usr/share/licenses
-  ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$_pkgname
+  ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
 }
 
 package_python2-gdal-hdf4 () {
-  provides=(python2-gdal)
-  conflicts=(python2-gdal)
   pkgdesc="Python 2 bindings for GDAL, with support to HDF4 format"
-  depends=("gdal=$pkgver" 'python2-numpy')
+  provides=("python2-gdal")
+  conflicts=("python2-gdal")
+  depends=("gdal-hdf4=$pkgver" 'python2-numpy')
   optdepends=()
 
   cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
@@ -122,5 +128,5 @@ package_python2-gdal-hdf4 () {
   for file in "${pkgdir}"/usr/bin/*; do mv "${file}" "${file%.py}2.py"; done
 
   install -dm755 "${pkgdir}"/usr/share/licenses
-  ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$_pkgname
+  ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
 }
diff --git a/gdal-2.2-poppler-0.58.patch b/gdal-2.2-poppler-0.58.patch
deleted file mode 100644
index e11cd3f78a39..000000000000
--- a/gdal-2.2-poppler-0.58.patch
+++ /dev/null
@@ -1,625 +0,0 @@
-Index: /branches/2.2/gdal/GDALmake.opt.in

-===================================================================

---- /branches/2.2/gdal/GDALmake.opt.in	(revision 40035)

-+++ /branches/2.2/gdal/GDALmake.opt.in	(revision 40036)

-@@ -473,4 +473,5 @@

- POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@

- POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@

-+POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@

- POPPLER_INC = @POPPLER_INC@

- POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@

-Index: /branches/2.2/gdal/configure

-===================================================================

---- /branches/2.2/gdal/configure	(revision 40035)

-+++ /branches/2.2/gdal/configure	(revision 40036)

-@@ -663,4 +663,5 @@

- POPPLER_PLUGIN_LIB

- POPPLER_INC

-+POPPLER_0_58_OR_LATER

- POPPLER_0_23_OR_LATER

- POPPLER_0_20_OR_LATER

-@@ -32272,4 +32273,6 @@

- POPPLER_BASE_STREAM_HAS_TWO_ARGS=no

- POPPLER_0_20_OR_LATER=no

-+POPPLER_0_23_OR_LATER=no

-+POPPLER_0_58_OR_LATER=no

- 

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5

-@@ -32312,15 +32315,19 @@

-         POPPLER_PLUGIN_LIB="${TEST_POPPLER_LIB}"

- 

--        # And now try another dirty thing, but this one is

--        # optional.

--        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Catalog::optContent exists" >&5

--$as_echo_n "checking if Catalog::optContent exists... " >&6; }

-+        CHECK_OTHER_POPPLER_VERSION=yes

-+

-+        # And now we check if we have Poppler >= 0.58.0

-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5

-+$as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }

-         rm -f testpoppler.*

--        echo '#define private public' > testpoppler.cpp

--        echo '#include <poppler/Object.h>' >> testpoppler.cpp

--        echo '#include <poppler/Catalog.h>' >> testpoppler.cpp

--        echo 'int main(int argc, char** argv) { return &(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp

-+        echo '#include <poppler/Object.h>' > testpoppler.cpp

-+        echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp

-         if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

-+            POPPLER_0_58_OR_LATER=yes

-+            POPPLER_0_23_OR_LATER=yes

-+            POPPLER_0_20_OR_LATER=yes

-+            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

-             POPPLER_HAS_OPTCONTENT=yes

-+            CHECK_OTHER_POPPLER_VERSION=no

-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

- $as_echo "yes" >&6; }

-@@ -32330,48 +32337,73 @@

-         fi

- 

--        # And now we check if we have Poppler >= 0.16.0

--        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if BaseStream constructor needs 2 arguments" >&5

--$as_echo_n "checking if BaseStream constructor needs 2 arguments... " >&6; }

--        rm -f testpoppler.*

--        echo '#include <poppler/Object.h>' > testpoppler.cpp

--        echo '#include <poppler/Stream.h>' >> testpoppler.cpp

--        echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

--        echo 'public:' >> testpoppler.cpp

--        echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

--        echo '};' >> testpoppler.cpp

--        echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

--        if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

--            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

--$as_echo "yes" >&6; }

--

--            # And now we check if we have Poppler >= 0.20.0

--            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.20.0" >&5

--$as_echo_n "checking if we have Poppler >= 0.20.0... " >&6; }

-+        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then

-+

-+            # And now try another dirty thing, but this one is

-+            # optional.

-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Catalog::optContent exists" >&5

-+$as_echo_n "checking if Catalog::optContent exists... " >&6; }

-             rm -f testpoppler.*

--            echo '#include <poppler/Error.h>' > testpoppler.cpp

--            echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp

-+            echo '#define private public' > testpoppler.cpp

-+            echo '#include <poppler/Object.h>' >> testpoppler.cpp

-+            echo '#include <poppler/Catalog.h>' >> testpoppler.cpp

-+            echo 'int main(int argc, char** argv) { return &(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp

-             if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

--                POPPLER_0_20_OR_LATER=yes

-+                POPPLER_HAS_OPTCONTENT=yes

-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

- $as_echo "yes" >&6; }

--

--                # And now we check if we have Poppler >= 0.23.0

--                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.23.0" >&5

--$as_echo_n "checking if we have Poppler >= 0.23.0... " >&6; }

-+            else

-+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-+$as_echo "no" >&6; }

-+            fi

-+

-+            # And now we check if we have Poppler >= 0.16.0

-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if BaseStream constructor needs 2 arguments" >&5

-+$as_echo_n "checking if BaseStream constructor needs 2 arguments... " >&6; }

-+            rm -f testpoppler.*

-+            echo '#include <poppler/Object.h>' > testpoppler.cpp

-+            echo '#include <poppler/Stream.h>' >> testpoppler.cpp

-+            echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

-+            echo 'public:' >> testpoppler.cpp

-+            echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

-+            echo '};' >> testpoppler.cpp

-+            echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

-+            if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

-+                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

-+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-+$as_echo "yes" >&6; }

-+

-+                # And now we check if we have Poppler >= 0.20.0

-+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.20.0" >&5

-+$as_echo_n "checking if we have Poppler >= 0.20.0... " >&6; }

-                 rm -f testpoppler.*

--                echo '#include <poppler/Object.h>' > testpoppler.cpp

--                echo '#include <poppler/Stream.h>' >> testpoppler.cpp

--                echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

--                echo 'public:' >> testpoppler.cpp

--                echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

--                echo '  ~TestStream() {}' >> testpoppler.cpp

--                echo '  virtual BaseStream *copy() { return BaseStream::copy(); }' >> testpoppler.cpp

--                echo '};' >> testpoppler.cpp

--                echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

-+                echo '#include <poppler/Error.h>' > testpoppler.cpp

-+                echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp

-                 if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

--                    POPPLER_0_23_OR_LATER=yes

-+                    POPPLER_0_20_OR_LATER=yes

-                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

- $as_echo "yes" >&6; }

-+

-+                    # And now we check if we have Poppler >= 0.23.0

-+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.23.0" >&5

-+$as_echo_n "checking if we have Poppler >= 0.23.0... " >&6; }

-+                    rm -f testpoppler.*

-+                    echo '#include <poppler/Object.h>' > testpoppler.cpp

-+                    echo '#include <poppler/Stream.h>' >> testpoppler.cpp

-+                    echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

-+                    echo 'public:' >> testpoppler.cpp

-+                    echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

-+                    echo '  ~TestStream() {}' >> testpoppler.cpp

-+                    echo '  virtual BaseStream *copy() { return BaseStream::copy(); }' >> testpoppler.cpp

-+                    echo '};' >> testpoppler.cpp

-+                    echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

-+                    if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

-+                        POPPLER_0_23_OR_LATER=yes

-+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-+$as_echo "yes" >&6; }

-+                    else

-+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-+$as_echo "no" >&6; }

-+                    fi

-+

-                 else

-                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-@@ -32383,8 +32415,4 @@

- $as_echo "no" >&6; }

-             fi

--

--        else

--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

--$as_echo "no" >&6; }

-         fi

-     else

-@@ -32408,4 +32436,6 @@

- 

- POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER

-+

-+POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER

- 

- POPPLER_INC=$POPPLER_INC

-Index: /branches/2.2/gdal/configure.ac

-===================================================================

---- /branches/2.2/gdal/configure.ac	(revision 40035)

-+++ /branches/2.2/gdal/configure.ac	(revision 40036)

-@@ -4284,4 +4284,6 @@

- POPPLER_BASE_STREAM_HAS_TWO_ARGS=no

- POPPLER_0_20_OR_LATER=no

-+POPPLER_0_23_OR_LATER=no

-+POPPLER_0_58_OR_LATER=no

- 

- AC_MSG_CHECKING([for poppler])

-@@ -4322,14 +4324,18 @@

-         POPPLER_PLUGIN_LIB="${TEST_POPPLER_LIB}"

- 

--        # And now try another dirty thing, but this one is

--        # optional.

--        AC_MSG_CHECKING([if Catalog::optContent exists])

-+        CHECK_OTHER_POPPLER_VERSION=yes

-+

-+        # And now we check if we have Poppler >= 0.58.0

-+        AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])

-         rm -f testpoppler.*

--        echo '#define private public' > testpoppler.cpp

--        echo '#include <poppler/Object.h>' >> testpoppler.cpp

--        echo '#include <poppler/Catalog.h>' >> testpoppler.cpp

--        echo 'int main(int argc, char** argv) { return &(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp

-+        echo '#include <poppler/Object.h>' > testpoppler.cpp

-+        echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp

-         if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

-+            POPPLER_0_58_OR_LATER=yes

-+            POPPLER_0_23_OR_LATER=yes

-+            POPPLER_0_20_OR_LATER=yes

-+            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

-             POPPLER_HAS_OPTCONTENT=yes

-+            CHECK_OTHER_POPPLER_VERSION=no

-             AC_MSG_RESULT([yes])

-         else

-@@ -4337,42 +4343,63 @@

-         fi

- 

--        # And now we check if we have Poppler >= 0.16.0

--        AC_MSG_CHECKING([if BaseStream constructor needs 2 arguments])

--        rm -f testpoppler.*

--        echo '#include <poppler/Object.h>' > testpoppler.cpp

--        echo '#include <poppler/Stream.h>' >> testpoppler.cpp

--        echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

--        echo 'public:' >> testpoppler.cpp

--        echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

--        echo '};' >> testpoppler.cpp

--        echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

--        if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

--            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

--            AC_MSG_RESULT([yes])

--

--            # And now we check if we have Poppler >= 0.20.0

--            AC_MSG_CHECKING([if we have Poppler >= 0.20.0])

-+        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then

-+

-+            # And now try another dirty thing, but this one is

-+            # optional.

-+            AC_MSG_CHECKING([if Catalog::optContent exists])

-             rm -f testpoppler.*

--            echo '#include <poppler/Error.h>' > testpoppler.cpp

--            echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp

-+            echo '#define private public' > testpoppler.cpp

-+            echo '#include <poppler/Object.h>' >> testpoppler.cpp

-+            echo '#include <poppler/Catalog.h>' >> testpoppler.cpp

-+            echo 'int main(int argc, char** argv) { return &(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp

-             if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

--                POPPLER_0_20_OR_LATER=yes

-+                POPPLER_HAS_OPTCONTENT=yes

-                 AC_MSG_RESULT([yes])

--

--                # And now we check if we have Poppler >= 0.23.0

--                AC_MSG_CHECKING([if we have Poppler >= 0.23.0])

-+            else

-+                AC_MSG_RESULT([no])

-+            fi

-+

-+            # And now we check if we have Poppler >= 0.16.0

-+            AC_MSG_CHECKING([if BaseStream constructor needs 2 arguments])

-+            rm -f testpoppler.*

-+            echo '#include <poppler/Object.h>' > testpoppler.cpp

-+            echo '#include <poppler/Stream.h>' >> testpoppler.cpp

-+            echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

-+            echo 'public:' >> testpoppler.cpp

-+            echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

-+            echo '};' >> testpoppler.cpp

-+            echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

-+            if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

-+                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

-+                AC_MSG_RESULT([yes])

-+

-+                # And now we check if we have Poppler >= 0.20.0

-+                AC_MSG_CHECKING([if we have Poppler >= 0.20.0])

-                 rm -f testpoppler.*

--                echo '#include <poppler/Object.h>' > testpoppler.cpp

--                echo '#include <poppler/Stream.h>' >> testpoppler.cpp

--                echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

--                echo 'public:' >> testpoppler.cpp

--                echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

--                echo '  ~TestStream() {}' >> testpoppler.cpp

--                echo '  virtual BaseStream *copy() { return BaseStream::copy(); }' >> testpoppler.cpp

--                echo '};' >> testpoppler.cpp

--                echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

-+                echo '#include <poppler/Error.h>' > testpoppler.cpp

-+                echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp

-                 if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

--                    POPPLER_0_23_OR_LATER=yes

-+                    POPPLER_0_20_OR_LATER=yes

-                     AC_MSG_RESULT([yes])

-+

-+                    # And now we check if we have Poppler >= 0.23.0

-+                    AC_MSG_CHECKING([if we have Poppler >= 0.23.0])

-+                    rm -f testpoppler.*

-+                    echo '#include <poppler/Object.h>' > testpoppler.cpp

-+                    echo '#include <poppler/Stream.h>' >> testpoppler.cpp

-+                    echo 'class TestStream: public BaseStream {' >> testpoppler.cpp

-+                    echo 'public:' >> testpoppler.cpp

-+                    echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp

-+                    echo '  ~TestStream() {}' >> testpoppler.cpp

-+                    echo '  virtual BaseStream *copy() { return BaseStream::copy(); }' >> testpoppler.cpp

-+                    echo '};' >> testpoppler.cpp

-+                    echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp

-+                    if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

-+                        POPPLER_0_23_OR_LATER=yes

-+                        AC_MSG_RESULT([yes])

-+                    else

-+                        AC_MSG_RESULT([no])

-+                    fi

-+

-                 else

-                     AC_MSG_RESULT([no])

-@@ -4382,7 +4409,4 @@

-                 AC_MSG_RESULT([no])

-             fi

--

--        else

--            AC_MSG_RESULT([no])

-         fi

-     else

-@@ -4400,4 +4424,5 @@

- AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)

- AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)

-+AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)

- AC_SUBST(POPPLER_INC, $POPPLER_INC)

- AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)

-Index: /branches/2.2/gdal/frmts/pdf/GNUmakefile

-===================================================================

---- /branches/2.2/gdal/frmts/pdf/GNUmakefile	(revision 40035)

-+++ /branches/2.2/gdal/frmts/pdf/GNUmakefile	(revision 40036)

-@@ -32,4 +32,8 @@

- endif

- 

-+ifeq ($(POPPLER_0_58_OR_LATER),yes)

-+CPPFLAGS +=  -DPOPPLER_0_58_OR_LATER

-+endif

-+

- ifeq ($(HAVE_PODOFO),yes)

- CPPFLAGS +=  -DHAVE_PODOFO

-Index: /branches/2.2/gdal/frmts/pdf/makefile.vc

-===================================================================

---- /branches/2.2/gdal/frmts/pdf/makefile.vc	(revision 40035)

-+++ /branches/2.2/gdal/frmts/pdf/makefile.vc	(revision 40036)

-@@ -15,5 +15,5 @@

- 

- !IFDEF POPPLER_ENABLED

--POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) -DHAVE_POPPLER

-+POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) -DHAVE_POPPLER

- 

- !IFDEF POPPLER_HAS_OPTCONTENT

-@@ -31,4 +31,8 @@

- !IFDEF POPPLER_0_23_OR_LATER

- POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER

-+!ENDIF

-+

-+!IFDEF POPPLER_0_58_OR_LATER

-+POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER

- !ENDIF

- 

-Index: /branches/2.2/gdal/frmts/pdf/pdfdataset.cpp

-===================================================================

---- /branches/2.2/gdal/frmts/pdf/pdfdataset.cpp	(revision 40035)

-+++ /branches/2.2/gdal/frmts/pdf/pdfdataset.cpp	(revision 40036)

-@@ -130,5 +130,9 @@

- public:

-     ObjectAutoFree() {}

--    ~ObjectAutoFree() { obj.free(); }

-+    ~ObjectAutoFree() {

-+#ifndef POPPLER_0_58_OR_LATER

-+        obj.free();

-+#endif

-+    }

- 

-     Object* getObj() { return &obj; }

-@@ -2286,5 +2290,9 @@

-     {

-         poCatalogObjectPoppler = new ObjectAutoFree;

-+#ifdef POPPLER_0_58_OR_LATER

-+        *poCatalogObjectPoppler->getObj() = poDocPoppler->getXRef()->getCatalog();

-+#else

-         poDocPoppler->getXRef()->getCatalog(poCatalogObjectPoppler->getObj());

-+#endif

-         if (!poCatalogObjectPoppler->getObj()->isNull())

-             poCatalogObject = new GDALPDFObjectPoppler(poCatalogObjectPoppler->getObj(), FALSE);

-@@ -4027,5 +4035,9 @@

- #ifdef HAVE_POPPLER

-     PDFDoc* poDocPoppler = NULL;

-+#ifdef POPPLER_0_58_OR_LATER

-+    Object oObj;

-+#else

-     ObjectAutoFree oObj;

-+#endif

-     Page* poPagePoppler = NULL;

-     Catalog* poCatalogPoppler = NULL;

-@@ -4074,6 +4086,10 @@

-             poUserPwd = new GooString(pszUserPwd);

- 

-+#ifdef POPPLER_0_58_OR_LATER

-+        poDocPoppler = new PDFDoc(new VSIPDFFileStream(fp, pszFilename, std::move(oObj)), NULL, poUserPwd);

-+#else

-         oObj.getObj()->initNull();

-         poDocPoppler = new PDFDoc(new VSIPDFFileStream(fp, pszFilename, oObj.getObj()), NULL, poUserPwd);

-+#endif

-         delete poUserPwd;

- 

-@@ -4766,8 +4782,14 @@

-     {

-         Object oInfo;

-+#ifdef POPPLER_0_58_OR_LATER

-+        oInfo = poDocPoppler->getDocInfo();

-+#else

-         poDocPoppler->getDocInfo(&oInfo);

-+#endif

-         GDALPDFObjectPoppler oInfoObjPoppler(&oInfo, FALSE);

-         poDS->ParseInfo(&oInfoObjPoppler);

-+#ifndef POPPLER_0_58_OR_LATER

-         oInfo.free();

-+#endif

-     }

- 

-Index: /branches/2.2/gdal/frmts/pdf/pdfio.cpp

-===================================================================

---- /branches/2.2/gdal/frmts/pdf/pdfio.cpp	(revision 40035)

-+++ /branches/2.2/gdal/frmts/pdf/pdfio.cpp	(revision 40036)

-@@ -53,6 +53,10 @@

- 

- VSIPDFFileStream::VSIPDFFileStream(

--    VSILFILE* fIn, const char* pszFilename, Object *dictA) :

--#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS

-+    VSILFILE* fIn, const char* pszFilename,

-+    makeSubStream_object_type dictA

-+) :

-+#ifdef POPPLER_0_58_OR_LATER

-+    BaseStream(std::move(dictA), (Goffset)VSIPDFFileStreamGetSize(fIn)),

-+#elif defined(POPPLER_BASE_STREAM_HAS_TWO_ARGS)

-     BaseStream(dictA, (setPos_offset_type)VSIPDFFileStreamGetSize(fIn)),

- #else

-@@ -78,6 +82,9 @@

- VSIPDFFileStream::VSIPDFFileStream( VSIPDFFileStream* poParentIn,

-                                     vsi_l_offset startA, GBool limitedA,

--                                    vsi_l_offset lengthA, Object *dictA ) :

--#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS

-+                                    vsi_l_offset lengthA,

-+                                    makeSubStream_object_type dictA) :

-+#ifdef POPPLER_0_58_OR_LATER

-+    BaseStream(std::move(dictA), (Goffset)lengthA),

-+#elif defined(POPPLER_BASE_STREAM_HAS_TWO_ARGS)

-     BaseStream(dictA, (makeSubStream_offset_type)lengthA),

- #else

-@@ -116,5 +123,11 @@

- /************************************************************************/

- 

--#ifdef POPPLER_0_23_OR_LATER

-+#ifdef POPPLER_0_58_OR_LATER

-+BaseStream* VSIPDFFileStream::copy()

-+{

-+    return new VSIPDFFileStream(poParent, nStart, bLimited,

-+                                nLength, dict.copy());

-+}

-+#elif defined(POPPLER_0_23_OR_LATER)

- BaseStream* VSIPDFFileStream::copy()

- {

-@@ -127,11 +140,16 @@

- /*                             makeSubStream()                          */

- /************************************************************************/

--

- Stream *VSIPDFFileStream::makeSubStream(makeSubStream_offset_type startA, GBool limitedA,

--                                        makeSubStream_offset_type lengthA, Object *dictA)

--{

-+                                        makeSubStream_offset_type lengthA, makeSubStream_object_type dictA)

-+{

-+#ifdef POPPLER_0_58_OR_LATER

-+    return new VSIPDFFileStream(this,

-+                                startA, limitedA,

-+                                lengthA, std::move(dictA));

-+#else

-     return new VSIPDFFileStream(this,

-                                 startA, limitedA,

-                                 lengthA, dictA);

-+#endif

- }

- 

-Index: /branches/2.2/gdal/frmts/pdf/pdfio.h

-===================================================================

---- /branches/2.2/gdal/frmts/pdf/pdfio.h	(revision 40035)

-+++ /branches/2.2/gdal/frmts/pdf/pdfio.h	(revision 40036)

-@@ -53,11 +53,19 @@

- #endif

- 

-+#ifdef POPPLER_0_58_OR_LATER

-+#define makeSubStream_object_type Object&&

-+#else

-+#define makeSubStream_object_type Object*

-+#endif

-+

- class VSIPDFFileStream: public BaseStream

- {

-     public:

--        VSIPDFFileStream(VSILFILE* f, const char* pszFilename, Object *dictA);

-+        VSIPDFFileStream(VSILFILE* f, const char* pszFilename,

-+                         makeSubStream_object_type dictA);

-         VSIPDFFileStream(VSIPDFFileStream* poParent,

-                          vsi_l_offset startA, GBool limitedA,

--                         vsi_l_offset lengthA, Object *dictA);

-+                         vsi_l_offset lengthA,

-+                         makeSubStream_object_type dictA);

-         virtual ~VSIPDFFileStream();

- 

-@@ -67,5 +75,5 @@

- 

-         virtual Stream *   makeSubStream(makeSubStream_offset_type startA, GBool limitedA,

--                                         makeSubStream_offset_type lengthA, Object *dictA) override;

-+                                         makeSubStream_offset_type lengthA, makeSubStream_object_type dictA) override;

-         virtual getPos_ret_type      getPos() override;

-         virtual getStart_ret_type    getStart() override;

-Index: /branches/2.2/gdal/frmts/pdf/pdfobject.cpp

-===================================================================

---- /branches/2.2/gdal/frmts/pdf/pdfobject.cpp	(revision 40035)

-+++ /branches/2.2/gdal/frmts/pdf/pdfobject.cpp	(revision 40036)

-@@ -972,5 +972,7 @@

- GDALPDFObjectPoppler::~GDALPDFObjectPoppler()

- {

-+#ifndef POPPLER_0_58_OR_LATER

-     m_po->free();

-+#endif

-     if (m_bDestroy)

-         delete m_po;

-@@ -1183,4 +1185,33 @@

-         return oIter->second;

- 

-+#ifdef POPPLER_0_58_OR_LATER

-+    Object o = m_poDict->lookupNF(((char*)pszKey));

-+    if (!o.isNull())

-+    {

-+        int nRefNum = 0;

-+        int nRefGen = 0;

-+        if( o.isRef())

-+        {

-+            nRefNum = o.getRefNum();

-+            nRefGen = o.getRefGen();

-+            Object o2 = m_poDict->lookup((char*)pszKey);

-+            if( !o2.isNull() )

-+            {

-+                GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);

-+                poObj->SetRefNumAndGen(nRefNum, nRefGen);

-+                m_map[pszKey] = poObj;

-+                return poObj;

-+            }

-+        }

-+        else

-+        {

-+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);

-+            poObj->SetRefNumAndGen(nRefNum, nRefGen);

-+            m_map[pszKey] = poObj;

-+            return poObj;

-+        }

-+    }

-+    return NULL;

-+#else

-     Object* po = new Object;

-     if (m_poDict->lookupNF((char*)pszKey, po) && !po->isNull())

-@@ -1211,4 +1242,5 @@

-         return NULL;

-     }

-+#endif

- }

- 

-@@ -1287,4 +1319,33 @@

-         return m_v[nIndex];

- 

-+#ifdef POPPLER_0_58_OR_LATER

-+    Object o = m_poArray->getNF(nIndex);

-+    if( !o.isNull() )

-+    {

-+        int nRefNum = 0;

-+        int nRefGen = 0;

-+        if( o.isRef())

-+        {

-+            nRefNum = o.getRefNum();

-+            nRefGen = o.getRefGen();

-+            Object o2 = m_poArray->get(nIndex);

-+            if( !o2.isNull() )

-+            {

-+                GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);

-+                poObj->SetRefNumAndGen(nRefNum, nRefGen);

-+                m_v[nIndex] = poObj;

-+                return poObj;

-+            }

-+        }

-+        else

-+        {

-+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);

-+            poObj->SetRefNumAndGen(nRefNum, nRefGen);

-+            m_v[nIndex] = poObj;

-+            return poObj;

-+        }

-+    }

-+    return NULL;

-+#else

-     Object* po = new Object;

-     if (m_poArray->getNF(nIndex, po))

-@@ -1315,4 +1376,5 @@

-         return NULL;

-     }

-+#endif

- }

- 

-Index: /branches/2.2/gdal/nmake.opt

-===================================================================

---- /branches/2.2/gdal/nmake.opt	(revision 40035)

-+++ /branches/2.2/gdal/nmake.opt	(revision 40036)

-@@ -622,4 +622,5 @@

- # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0

- # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0

-+# Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0

- #POPPLER_ENABLED = YES

- #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler

-@@ -628,4 +629,5 @@

- #POPPLER_0_20_OR_LATER = YES

- #POPPLER_0_23_OR_LATER = YES

-+#POPPLER_0_58_OR_LATER = YES

- #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib

- 

diff --git a/gdal-hdf4.changelog b/gdal-hdf4.changelog
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gdal-hdf4.changelog
diff --git a/gdal-perl-vendor.patch b/gdal-perl-vendor.patch
deleted file mode 100644
index 3918c15237f8..000000000000
--- a/gdal-perl-vendor.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: pass INSTALLDIRS=vendor to Makefile.PL to get stuff into the right place
-Origin: vendor
-Forwarded: not-needed
-Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2014-07-08
-
---- a/swig/perl/Makefile
-+++ b/swig/perl/Makefile
-@@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL
- 	$(MAKE) -f Makefile_Geo__OSR
- 
- Makefile_Geo__GDAL:
--	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
-+	perl Makefile.PL INSTALLDIRS=vendor
- 
- test: build
- 	$(MAKE) -f Makefile_Geo__GDAL test
---- a/swig/perl/GNUmakefile
-+++ b/swig/perl/GNUmakefile
-@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
- gdal_wrap.cc: generate
- 
- Makefile_Geo__GDAL: gdal_wrap.cc
--	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
-+	perl Makefile.PL INSTALLDIRS=vendor
- 
- test: build
- 	$(MAKE) -f Makefile_Geo__GDAL test
diff --git a/gdal-poppler-0.64.patch b/gdal-poppler-0.64.patch
deleted file mode 100644
index 7f15fc52cb86..000000000000
--- a/gdal-poppler-0.64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
-index ae734a74e4..c5a9935c00 100644
---- a/gdal/frmts/pdf/pdfobject.cpp
-+++ b/gdal/frmts/pdf/pdfobject.cpp
-@@ -1055,7 +1055,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
- {
-     if (GetType() == PDFObjectType_String)
-     {
--        GooString* gooString = m_po->getString();
-+        const GooString* gooString = m_po->getString();
-         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-                                                       static_cast<int>(gooString->getLength())));
-     }
diff --git a/gdal-python-install.patch b/gdal-python-install.patch
deleted file mode 100644
index 03bf6da4ba75..000000000000
--- a/gdal-python-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- swig/python/GNUmakefile.orig	2015-06-14 21:06:33.000000000 +0200
-+++ swig/python/GNUmakefile	2015-06-27 22:02:07.805035411 +0200
-@@ -70,5 +70,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
diff --git a/gdal.changelog b/gdal.changelog
deleted file mode 100644
index f49fd90213a7..000000000000
--- a/gdal.changelog
+++ /dev/null
@@ -1,102 +0,0 @@
-2018-07-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.3.1-1
-
-2018-05-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.3.0-1
-
-2018-04-09 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.2.4-1
-
-2017-11-26 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.2.3-1
-
-2017-10-21 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.2.2-1
-
-2017-08-06 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.2.1-1
-
-2017-07-10 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.2.0-1
-	* hdf5 1.10.1 rebuild
-
-2017-01-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.1.2-1
-
-2016-08-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild
-
-2016-06-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.1.0-2 cfitsio 3.390 rebuild
-
-2016-05-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.1.0-1
-
-2016-04-12 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.0.2-5
-	* hdf5 1.10.0 rebuild
-
-2016-02-08 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.0.2-1
-
-2016-01-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.0.0-7
-	* postgresql-libs 9.5 rebuild
-	* openjpeg2 added as dependency
-
-2015-10-06 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.0.1-2 FS#46581 fix
-
-2015-06-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 2.0.0-1
-
-2015-03-01 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.2-2 poppler 0.31.0 rebuild
-
-2015-02-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.2-1
-
-2015-01-29 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.1-6 poppler 0.30.0 rebuild
-
-2014-12-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.1-5 FS#43193 fix
-
-2014-12-20 Evangelos Foutras <evangelos@foutrelis.com>
-	* gdal 1.11.1-4 poppler 0.29.0 rebuild
-
-2014-11-25 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.1-3 hdf5 1.8.14 rebuild
-
-2014-10-03 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.1-1
-
-2014-07-28 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.0-4 libspatialite soname rebuild
-
-2014-05-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.0-2 giflib soname rebuild
-
-2014-04-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.11.0-1
-
-2013-11-11 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.10.1-1
-
-2013-09-29 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.10.0-4 FS#36328 fix
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.10.0-1
-
-2011-02-19 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* Update to major release 1.7.2