Date: Monday, November 11, 2019 @ 23:26:11 Author: foutrelis Revision: 526858
archrelease: copy trunk to community-staging-x86_64 Added: gdal/repos/community-staging-x86_64/ gdal/repos/community-staging-x86_64/PKGBUILD (from rev 526857, gdal/trunk/PKGBUILD) gdal/repos/community-staging-x86_64/gdal-perl-vendor.patch (from rev 526857, gdal/trunk/gdal-perl-vendor.patch) gdal/repos/community-staging-x86_64/gdal.changelog (from rev 526857, gdal/trunk/gdal.changelog) gdal/repos/community-staging-x86_64/poppler-0.82.patch (from rev 526857, gdal/trunk/poppler-0.82.patch) ------------------------+ PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++ gdal-perl-vendor.patch | 18 +++++++ gdal.changelog | 111 +++++++++++++++++++++++++++++++++++++++++++++++ poppler-0.82.patch | 54 ++++++++++++++++++++++ 4 files changed, 271 insertions(+) Copied: gdal/repos/community-staging-x86_64/PKGBUILD (from rev 526857, gdal/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-11-11 23:26:11 UTC (rev 526858) @@ -0,0 +1,88 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea <sillywi...@gmail.com> + +pkgbase=gdal +pkgname=('gdal' 'python-gdal') +pkgver=3.0.1 +pkgrel=4 +pkgdesc="A translator library for raster geospatial data formats" +arch=('x86_64') +url="http://www.gdal.org/" +license=('custom') +depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg-turbo' 'libpng' 'libspatialite' 'libtiff' 'netcdf' + 'openjpeg2' 'poppler' 'cfitsio' 'sqlite' 'mariadb-libs' 'postgresql-libs' 'xerces-c' 'json-c') +makedepends=('perl' 'swig' 'chrpath' 'doxygen' 'python-numpy' 'boost') +optdepends=('postgresql: postgresql database support' + 'mariadb: mariadb database support' + 'perl: perl binding support') +options=('!emptydirs') +changelog=$pkgbase.changelog +source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz + poppler-0.82.patch + gdal-perl-vendor.patch) +sha256sums=('45b4ae25dbd87282d589eca76481c426f72132d7a599556470d5c38263b09266' + '82acfb6cf822dcf05ea08cc7baf98d3bd8e19c447acff49cf3ea73fc81904ae0' + '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed') + +prepare() { + cd "${srcdir}"/$pkgbase-$pkgver + +# Fix mandir + sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure + +# Fix build with poppler 0.82 + patch -Np2 -i "${srcdir}"/poppler-0.82.patch + +# Fix Perl bindings installation path + patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch +} + +build() { + cd "${srcdir}"/$pkgbase-$pkgver + + ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 --with-geotiff \ + --with-mysql --with-curl --with-hdf5 --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 + + make + make man + + cd "${srcdir}"/$pkgbase-$pkgver/swig/python + python3 setup.py build +} + +package_gdal () { + cd "${srcdir}"/$pkgbase-$pkgver + + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install-man + +# install license + install -Dm644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/$pkgbase/LICENSE + +# Remove RPATH + eval local $(perl -V:vendorarch) + chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OSR/OSR.so + chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OGR/OGR.so + chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/GDAL.so + chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/Const/Const.so + chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GNM/GNM.so +} + +package_python-gdal () { + pkgdesc="Python bindings for GDAL" + depends=("gdal=$pkgver" 'python-numpy') + optdepends=() + + cd "${srcdir}"/$pkgbase-$pkgver/swig/python + python3 setup.py install --root="$pkgdir" --optimize=1 + install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py + + install -dm755 "${pkgdir}"/usr/share/licenses + ln -s $pkgbase "${pkgdir}"/usr/share/licenses/$pkgname +} Copied: gdal/repos/community-staging-x86_64/gdal-perl-vendor.patch (from rev 526857, gdal/trunk/gdal-perl-vendor.patch) =================================================================== --- community-staging-x86_64/gdal-perl-vendor.patch (rev 0) +++ community-staging-x86_64/gdal-perl-vendor.patch 2019-11-11 23:26:11 UTC (rev 526858) @@ -0,0 +1,18 @@ +Description: pass INSTALLDIRS=vendor to Makefile.PL to get stuff into the right place +Origin: vendor +Forwarded: not-needed +Author: gregor herrmann <gre...@debian.org> + +--- swig/perl/Makefile.orig 2018-12-14 22:34:20.000000000 +0100 ++++ swig/perl/Makefile 2018-12-25 17:52:06.053358428 +0100 +@@ -10 +10 @@ +- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX) ++ perl Makefile.PL INSTALLDIRS=vendor + + test: build + $(MAKE) -f Makefile_Geo__GDAL test +--- swig/perl/GNUmakefile.orig 2018-12-14 22:34:20.000000000 +0100 ++++ swig/perl/GNUmakefile 2018-12-25 17:52:28.636748048 +0100 +@@ -31 +31 @@ +- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX) ++ perl Makefile.PL INSTALLDIRS=vendor Copied: gdal/repos/community-staging-x86_64/gdal.changelog (from rev 526857, gdal/trunk/gdal.changelog) =================================================================== --- community-staging-x86_64/gdal.changelog (rev 0) +++ community-staging-x86_64/gdal.changelog 2019-11-11 23:26:11 UTC (rev 526858) @@ -0,0 +1,111 @@ +2019-06-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 3.0.0-1 + +2019-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.4.0-1 + +2018-09-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.3.2-1 + +2018-07-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.3.1-1 + +2018-05-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.3.0-1 + +2018-04-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.2.4-1 + +2017-11-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.2.3-1 + +2017-10-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.2.2-1 + +2017-08-06 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.2.1-1 + +2017-07-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.2.0-1 + * hdf5 1.10.1 rebuild + +2017-01-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.1.2-1 + +2016-08-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild + +2016-06-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.1.0-2 cfitsio 3.390 rebuild + +2016-05-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.1.0-1 + +2016-04-12 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.0.2-5 + * hdf5 1.10.0 rebuild + +2016-02-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.0.2-1 + +2016-01-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.0.0-7 + * postgresql-libs 9.5 rebuild + * openjpeg2 added as dependency + +2015-10-06 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.0.1-2 FS#46581 fix + +2015-06-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.0.0-1 + +2015-03-01 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.2-2 poppler 0.31.0 rebuild + +2015-02-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.2-1 + +2015-01-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.1-6 poppler 0.30.0 rebuild + +2014-12-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.1-5 FS#43193 fix + +2014-12-20 Evangelos Foutras <evange...@foutrelis.com> + * gdal 1.11.1-4 poppler 0.29.0 rebuild + +2014-11-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.1-3 hdf5 1.8.14 rebuild + +2014-10-03 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.1-1 + +2014-07-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.0-4 libspatialite soname rebuild + +2014-05-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.0-2 giflib soname rebuild + +2014-04-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.0-1 + +2013-11-11 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.10.1-1 + +2013-09-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.10.0-4 FS#36328 fix + +2013-05-18 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.10.0-1 + +2011-02-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.8.0-1 + +2010-11-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Update to major release 1.7.3 + +2010-06-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * FS#19946 fixed in 1.7.2-2 + +2010-05-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Update to major release 1.7.2 Copied: gdal/repos/community-staging-x86_64/poppler-0.82.patch (from rev 526857, gdal/trunk/poppler-0.82.patch) =================================================================== --- community-staging-x86_64/poppler-0.82.patch (rev 0) +++ community-staging-x86_64/poppler-0.82.patch 2019-11-11 23:26:11 UTC (rev 526858) @@ -0,0 +1,54 @@ +From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.roua...@spatialys.com> +Date: Sun, 29 Sep 2019 23:55:18 +0200 +Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp +index 3d68f92abe8..b3db5374227 100644 +--- a/gdal/frmts/pdf/pdfdataset.cpp ++++ b/gdal/frmts/pdf/pdfdataset.cpp +@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev + + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg) override ++ GBool interpolate, ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 ++ const ++#endif ++ int *maskColors, ++ GBool inlineImg) override + { + if (bEnableBitmap) + SplashOutputDev::drawImage(state, ref, str, + +From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.roua...@spatialys.com> +Date: Tue, 22 Oct 2019 13:11:57 +0200 +Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp +index 15537ca7fd7..8f944c40d30 100644 +--- a/gdal/frmts/pdf/pdfdataset.cpp ++++ b/gdal/frmts/pdf/pdfdataset.cpp +@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev + virtual void drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode code, int nBytes, Unicode *u, int uLen) override ++ CharCode code, int nBytes, ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 ++ const ++#endif ++ Unicode *u, int uLen) override + { + if (bEnableText) + SplashOutputDev::drawChar(state, x, y, dx, dy,