[arch-commits] Commit in gdal/repos/community-testing-x86_64 (8 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Wed Mar 2 15:50:48 UTC 2022
Date: Wednesday, March 2, 2022 @ 15:50:48
Author: foutrelis
Revision: 1139617
archrelease: copy trunk to community-testing-x86_64
Added:
gdal/repos/community-testing-x86_64/PKGBUILD
(from rev 1139616, gdal/trunk/PKGBUILD)
gdal/repos/community-testing-x86_64/gdal-perl-vendor.patch
(from rev 1139616, gdal/trunk/gdal-perl-vendor.patch)
gdal/repos/community-testing-x86_64/gdal.changelog
(from rev 1139616, gdal/trunk/gdal.changelog)
gdal/repos/community-testing-x86_64/poppler-22.03.0.patch
(from rev 1139616, gdal/trunk/poppler-22.03.0.patch)
Deleted:
gdal/repos/community-testing-x86_64/PKGBUILD
gdal/repos/community-testing-x86_64/gdal-perl-vendor.patch
gdal/repos/community-testing-x86_64/gdal.changelog
gdal/repos/community-testing-x86_64/poppler-22.03.0.patch
------------------------+
PKGBUILD | 176 +++++++++++++++----------------
gdal-perl-vendor.patch | 36 +++---
gdal.changelog | 264 +++++++++++++++++++++++------------------------
poppler-22.03.0.patch | 69 +++++++++---
4 files changed, 292 insertions(+), 253 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-02 15:50:41 UTC (rev 1139616)
+++ PKGBUILD 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -1,88 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=gdal
-pkgname=('gdal' 'python-gdal')
-pkgver=3.4.0
-pkgrel=4
-pkgdesc="A translator library for raster geospatial data formats"
-arch=('x86_64')
-url="https://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-breathe' 'python-numpy' 'python-sphinx' '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-22.03.0.patch
- gdal-perl-vendor.patch)
-sha256sums=('ac7bd2bb9436f3fc38bc7309704672980f82d64b4d57627d27849259b8f71d5c'
- 'f17b4d6f2e20c34140faf2154f6a64cc4afe10b484a13a0cac3a894f2919f16e'
- '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
-
-prepare() {
- cd "${srcdir}"/$pkgbase-$pkgver
-
-# Fix mandir
- sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
-
-# Fix build with poppler 22.03.0
- patch -Np1 -i "${srcdir}"/poppler-22.03.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
- python 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
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-# 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-testing-x86_64/PKGBUILD (from rev 1139616, gdal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -0,0 +1,88 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=gdal
+pkgname=('gdal' 'python-gdal')
+pkgver=3.4.0
+pkgrel=5
+pkgdesc="A translator library for raster geospatial data formats"
+arch=('x86_64')
+url="https://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-breathe' 'python-numpy' 'python-sphinx' '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-22.03.0.patch
+ gdal-perl-vendor.patch)
+sha256sums=('ac7bd2bb9436f3fc38bc7309704672980f82d64b4d57627d27849259b8f71d5c'
+ 'b60d94457199ab49ff11cbbb793cd6cd459c732265d342f1c04721f164383e73'
+ '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
+
+prepare() {
+ cd "${srcdir}"/$pkgbase-$pkgver
+
+# Fix mandir
+ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
+
+# Fix build with poppler 22.03.0
+ patch -Np1 -i "${srcdir}"/poppler-22.03.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
+ python 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
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+# 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 2022-03-02 15:50:41 UTC (rev 1139616)
+++ gdal-perl-vendor.patch 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -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 <gregoa at 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-testing-x86_64/gdal-perl-vendor.patch (from rev 1139616, gdal/trunk/gdal-perl-vendor.patch)
===================================================================
--- gdal-perl-vendor.patch (rev 0)
+++ gdal-perl-vendor.patch 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -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 <gregoa at 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 2022-03-02 15:50:41 UTC (rev 1139616)
+++ gdal.changelog 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -1,132 +0,0 @@
-2021-07-22 Bruno Pagani <archange at archlinux.org>
- * gdal 3.3.1-1
- * update url
- * netcdf 4.8.0 rebuild
- * hdf5 1.12.1 rebuild
-
-2021-06-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 3.3.0-1
-
-2021-05-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 3.2.3-1
-
-2020-01-30 Evangelos Foutras <evangelos at foutrelis.com>
- * gdal 3.0.4-1
-
-2020-01-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 3.0.3-1
-
-2019-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 3.0.2-1
-
-2019-06-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 3.0.0-1
-
-2019-02-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.4.0-1
-
-2018-09-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.3.2-1
-
-2018-07-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.3.1-1
-
-2018-05-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.3.0-1
-
-2018-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.2.4-1
-
-2017-11-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.2.3-1
-
-2017-10-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.2.2-1
-
-2017-08-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.2.1-1
-
-2017-07-10 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.2.0-1
- * hdf5 1.10.1 rebuild
-
-2017-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.1.2-1
-
-2016-08-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild
-
-2016-06-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.1.0-2 cfitsio 3.390 rebuild
-
-2016-05-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.1.0-1
-
-2016-04-12 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.0.2-5
- * hdf5 1.10.0 rebuild
-
-2016-02-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.0.2-1
-
-2016-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.0.0-7
- * postgresql-libs 9.5 rebuild
- * openjpeg2 added as dependency
-
-2015-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.0.1-2 FS#46581 fix
-
-2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 2.0.0-1
-
-2015-03-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.2-2 poppler 0.31.0 rebuild
-
-2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.2-1
-
-2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-6 poppler 0.30.0 rebuild
-
-2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-5 FS#43193 fix
-
-2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
- * gdal 1.11.1-4 poppler 0.29.0 rebuild
-
-2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-3 hdf5 1.8.14 rebuild
-
-2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-1
-
-2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-4 libspatialite soname rebuild
-
-2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-2 giflib soname rebuild
-
-2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-1
-
-2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.1-1
-
-2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.0-4 FS#36328 fix
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.0-1
-
-2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.7.2
Copied: gdal/repos/community-testing-x86_64/gdal.changelog (from rev 1139616, gdal/trunk/gdal.changelog)
===================================================================
--- gdal.changelog (rev 0)
+++ gdal.changelog 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -0,0 +1,132 @@
+2021-07-22 Bruno Pagani <archange at archlinux.org>
+ * gdal 3.3.1-1
+ * update url
+ * netcdf 4.8.0 rebuild
+ * hdf5 1.12.1 rebuild
+
+2021-06-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 3.3.0-1
+
+2021-05-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 3.2.3-1
+
+2020-01-30 Evangelos Foutras <evangelos at foutrelis.com>
+ * gdal 3.0.4-1
+
+2020-01-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 3.0.3-1
+
+2019-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 3.0.2-1
+
+2019-06-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 3.0.0-1
+
+2019-02-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.4.0-1
+
+2018-09-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.3.2-1
+
+2018-07-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.3.1-1
+
+2018-05-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.3.0-1
+
+2018-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.2.4-1
+
+2017-11-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.2.3-1
+
+2017-10-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.2.2-1
+
+2017-08-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.2.1-1
+
+2017-07-10 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.2.0-1
+ * hdf5 1.10.1 rebuild
+
+2017-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.1.2-1
+
+2016-08-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild
+
+2016-06-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.1.0-2 cfitsio 3.390 rebuild
+
+2016-05-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.1.0-1
+
+2016-04-12 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.0.2-5
+ * hdf5 1.10.0 rebuild
+
+2016-02-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.0.2-1
+
+2016-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.0.0-7
+ * postgresql-libs 9.5 rebuild
+ * openjpeg2 added as dependency
+
+2015-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.0.1-2 FS#46581 fix
+
+2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 2.0.0-1
+
+2015-03-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.2-2 poppler 0.31.0 rebuild
+
+2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.2-1
+
+2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-6 poppler 0.30.0 rebuild
+
+2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-5 FS#43193 fix
+
+2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
+ * gdal 1.11.1-4 poppler 0.29.0 rebuild
+
+2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-3 hdf5 1.8.14 rebuild
+
+2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-1
+
+2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-4 libspatialite soname rebuild
+
+2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-2 giflib soname rebuild
+
+2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-1
+
+2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.1-1
+
+2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.0-4 FS#36328 fix
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.0-1
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.8.0-1
+
+2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.7.3
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#19946 fixed in 1.7.2-2
+
+2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.7.2
Deleted: poppler-22.03.0.patch
===================================================================
--- poppler-22.03.0.patch 2022-03-02 15:50:41 UTC (rev 1139616)
+++ poppler-22.03.0.patch 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -1,15 +0,0 @@
-diff -upr gdal-3.4.0.orig/frmts/pdf/pdfdataset.cpp gdal-3.4.0/frmts/pdf/pdfdataset.cpp
---- gdal-3.4.0.orig/frmts/pdf/pdfdataset.cpp 2021-11-04 13:57:20.000000000 +0200
-+++ gdal-3.4.0/frmts/pdf/pdfdataset.cpp 2022-03-02 13:17:56.964778481 +0200
-@@ -4322,7 +4322,11 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
- oObj.getObj()->initNull();
- auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
- #endif
-+#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION >= 3)
-+ poDocPoppler = new PDFDoc(poStream, std::nullopt, GooString(poUserPwd));
-+#else
- poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
-+#endif
- if( globalParamsCreatedByGDAL )
- registerErrorCallback();
- delete poUserPwd;
Copied: gdal/repos/community-testing-x86_64/poppler-22.03.0.patch (from rev 1139616, gdal/trunk/poppler-22.03.0.patch)
===================================================================
--- poppler-22.03.0.patch (rev 0)
+++ poppler-22.03.0.patch 2022-03-02 15:50:48 UTC (rev 1139617)
@@ -0,0 +1,54 @@
+From 17e98757e78969a199d1d6318f53d088da192191 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at spatialys.com>
+Date: Fri, 18 Feb 2022 22:47:01 +0100
+Subject: [PATCH] PDF: fix build against Poppler > 22.2
+
+---
+ frmts/pdf/pdfdataset.cpp | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 22238bd74822..08f8e31c86a7 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -4241,8 +4241,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+ if(bUseLib.test(PDFLIB_POPPLER))
+ {
+- GooString* poUserPwd = nullptr;
+-
+ static bool globalParamsCreatedByGDAL = false;
+ {
+ CPLMutexHolderD(&hGlobalParamsMutex);
+@@ -4310,9 +4308,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ while( true )
+ {
+ VSIFSeekL(fp, 0, SEEK_SET);
+- if (pszUserPwd)
+- poUserPwd = new GooString(pszUserPwd);
+-
+ g_nPopplerErrors = 0;
+ if( globalParamsCreatedByGDAL )
+ registerErrorCallback();
+@@ -4322,10 +4317,20 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ oObj.getObj()->initNull();
+ auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
+ #endif
++#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 2)
++ std::optional<GooString> osUserPwd;
++ if (pszUserPwd)
++ osUserPwd = std::optional<GooString>(pszUserPwd);
++ poDocPoppler = new PDFDoc(poStream, std::optional<GooString>(), osUserPwd);
++#else
++ GooString* poUserPwd = nullptr;
++ if (pszUserPwd)
++ poUserPwd = new GooString(pszUserPwd);
+ poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
++ delete poUserPwd;
++#endif
+ if( globalParamsCreatedByGDAL )
+ registerErrorCallback();
+- delete poUserPwd;
+ if( g_nPopplerErrors >= MAX_POPPLER_ERRORS )
+ {
+ PDFFreeDoc(poDocPoppler);
More information about the arch-commits
mailing list