Date: Saturday, April 17, 2021 @ 19:39:34 Author: foutrelis Revision: 919823
archrelease: copy trunk to community-x86_64 Added: gdal/repos/community-x86_64/PKGBUILD (from rev 919822, gdal/trunk/PKGBUILD) gdal/repos/community-x86_64/gdal-perl-vendor.patch (from rev 919822, gdal/trunk/gdal-perl-vendor.patch) gdal/repos/community-x86_64/gdal.changelog (from rev 919822, gdal/trunk/gdal.changelog) gdal/repos/community-x86_64/poppler-20.08.0.patch (from rev 919822, gdal/trunk/poppler-20.08.0.patch) Deleted: gdal/repos/community-x86_64/PKGBUILD gdal/repos/community-x86_64/gdal-perl-vendor.patch gdal/repos/community-x86_64/gdal.changelog gdal/repos/community-x86_64/poppler-20.08.0.patch ------------------------+ PKGBUILD | 176 +++++++++++++++++----------------- gdal-perl-vendor.patch | 36 +++---- gdal.changelog | 240 +++++++++++++++++++++++------------------------ poppler-20.08.0.patch | 84 ++++++++-------- 4 files changed, 268 insertions(+), 268 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-04-17 19:39:28 UTC (rev 919822) +++ PKGBUILD 2021-04-17 19:39:34 UTC (rev 919823) @@ -1,88 +0,0 @@ -# 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.4 -pkgrel=22 -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-20.08.0.patch - gdal-perl-vendor.patch) -sha256sums=('5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277' - 'dc8ccbc9a672a8489a1660fa66804d74c3015c47b44e2d41e17f8609249279df' - '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed') - -prepare() { - cd "${srcdir}"/$pkgbase-$pkgver - -# Fix mandir - sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure - -# Fix build with poppler 20.08.0 - patch -Np2 -i "${srcdir}"/poppler-20.08.0.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-x86_64/PKGBUILD (from rev 919822, gdal/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-04-17 19:39:34 UTC (rev 919823) @@ -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.4 +pkgrel=23 +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-20.08.0.patch + gdal-perl-vendor.patch) +sha256sums=('5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277' + 'dc8ccbc9a672a8489a1660fa66804d74c3015c47b44e2d41e17f8609249279df' + '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed') + +prepare() { + cd "${srcdir}"/$pkgbase-$pkgver + +# Fix mandir + sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure + +# Fix build with poppler 20.08.0 + patch -Np2 -i "${srcdir}"/poppler-20.08.0.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 +} Deleted: gdal-perl-vendor.patch =================================================================== --- gdal-perl-vendor.patch 2021-04-17 19:39:28 UTC (rev 919822) +++ gdal-perl-vendor.patch 2021-04-17 19:39:34 UTC (rev 919823) @@ -1,18 +0,0 @@ -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-x86_64/gdal-perl-vendor.patch (from rev 919822, gdal/trunk/gdal-perl-vendor.patch) =================================================================== --- gdal-perl-vendor.patch (rev 0) +++ gdal-perl-vendor.patch 2021-04-17 19:39:34 UTC (rev 919823) @@ -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 Deleted: gdal.changelog =================================================================== --- gdal.changelog 2021-04-17 19:39:28 UTC (rev 919822) +++ gdal.changelog 2021-04-17 19:39:34 UTC (rev 919823) @@ -1,120 +0,0 @@ -2020-01-30 Evangelos Foutras <evange...@foutrelis.com> - * gdal 3.0.4-1 - -2020-01-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * gdal 3.0.3-1 - -2019-11-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * gdal 3.0.2-1 - -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-x86_64/gdal.changelog (from rev 919822, gdal/trunk/gdal.changelog) =================================================================== --- gdal.changelog (rev 0) +++ gdal.changelog 2021-04-17 19:39:34 UTC (rev 919823) @@ -0,0 +1,120 @@ +2020-01-30 Evangelos Foutras <evange...@foutrelis.com> + * gdal 3.0.4-1 + +2020-01-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 3.0.3-1 + +2019-11-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 3.0.2-1 + +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 Deleted: poppler-20.08.0.patch =================================================================== --- poppler-20.08.0.patch 2021-04-17 19:39:28 UTC (rev 919822) +++ poppler-20.08.0.patch 2021-04-17 19:39:34 UTC (rev 919823) @@ -1,42 +0,0 @@ -From 93e85e58b20eef678ac669083042d95f8586c2d6 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.roua...@spatialys.com> -Date: Mon, 3 Aug 2020 14:52:25 +0200 -Subject: [PATCH] Unix build: fix detection of minor version number of Poppler - with the new YY.MM.X numbering scheme (fixes #2823) (#2825) - -Authored-by: @chris2553 ---- - gdal/configure | 4 ++-- - gdal/configure.ac | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gdal/configure b/gdal/configure -index 4dab50a48ba..e4cc4ada347 100755 ---- a/gdal/configure -+++ b/gdal/configure -@@ -40695,8 +40695,8 @@ $as_echo "yes" >&6; } - fi - if test "$POPPLER_VERSION" != ""; then - HAVE_POPPLER=yes -- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'` -- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'` -+ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` -+ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` - POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` - fi - else -diff --git a/gdal/configure.ac b/gdal/configure.ac -index 126ddb5ba42..f9893f844bd 100644 ---- a/gdal/configure.ac -+++ b/gdal/configure.ac -@@ -4945,8 +4945,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then - [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=]) - if test "$POPPLER_VERSION" != ""; then - HAVE_POPPLER=yes -- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'` -- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` -+ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` -+ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` - POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` - fi - else Copied: gdal/repos/community-x86_64/poppler-20.08.0.patch (from rev 919822, gdal/trunk/poppler-20.08.0.patch) =================================================================== --- poppler-20.08.0.patch (rev 0) +++ poppler-20.08.0.patch 2021-04-17 19:39:34 UTC (rev 919823) @@ -0,0 +1,42 @@ +From 93e85e58b20eef678ac669083042d95f8586c2d6 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.roua...@spatialys.com> +Date: Mon, 3 Aug 2020 14:52:25 +0200 +Subject: [PATCH] Unix build: fix detection of minor version number of Poppler + with the new YY.MM.X numbering scheme (fixes #2823) (#2825) + +Authored-by: @chris2553 +--- + gdal/configure | 4 ++-- + gdal/configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gdal/configure b/gdal/configure +index 4dab50a48ba..e4cc4ada347 100755 +--- a/gdal/configure ++++ b/gdal/configure +@@ -40695,8 +40695,8 @@ $as_echo "yes" >&6; } + fi + if test "$POPPLER_VERSION" != ""; then + HAVE_POPPLER=yes +- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'` +- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'` ++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` ++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` + POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` + fi + else +diff --git a/gdal/configure.ac b/gdal/configure.ac +index 126ddb5ba42..f9893f844bd 100644 +--- a/gdal/configure.ac ++++ b/gdal/configure.ac +@@ -4945,8 +4945,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then + [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=]) + if test "$POPPLER_VERSION" != ""; then + HAVE_POPPLER=yes +- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'` +- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` ++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` ++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` + POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` + fi + else