[arch-commits] Commit in gdal/trunk (PKGBUILD poppler-20.08.0.patch)

[Balló György]

    Date: Sunday, April 18, 2021 @ 19:03:40
  Author: bgyorgy
Revision: 919936

upgpkg: gdal 3.2.2-1: Update to new version (soname changed)

Modified:
  gdal/trunk/PKGBUILD
Deleted:
  gdal/trunk/poppler-20.08.0.patch

-----------------------+
 PKGBUILD              |   17 ++++++-----------
 poppler-20.08.0.patch |   42 ------------------------------------------
 2 files changed, 6 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-18 18:56:40 UTC (rev 919935)
+++ PKGBUILD	2021-04-18 19:03:40 UTC (rev 919936)
@@ -4,8 +4,8 @@
 
 pkgbase=gdal
 pkgname=('gdal' 'python-gdal')
-pkgver=3.0.4
-pkgrel=23
+pkgver=3.2.2
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('x86_64')
 url="http://www.gdal.org/"
@@ -12,7 +12,7 @@
 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')
+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')
@@ -19,10 +19,8 @@
 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'
+sha256sums=('a7e1e414e5c405af48982bf4724a3da64a05770254f2ce8affb5f58a7604ca57'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -31,9 +29,6 @@
 # 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
 }
@@ -53,7 +48,7 @@
   make man
 
   cd "${srcdir}"/$pkgbase-$pkgver/swig/python
-  python3 setup.py build
+  python setup.py build
 }
 
 package_gdal () {
@@ -80,7 +75,7 @@
   optdepends=()
 
   cd "${srcdir}"/$pkgbase-$pkgver/swig/python
-  python3 setup.py install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
   install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
 
   install -dm755 "${pkgdir}"/usr/share/licenses

Deleted: poppler-20.08.0.patch
===================================================================
--- poppler-20.08.0.patch	2021-04-18 18:56:40 UTC (rev 919935)
+++ poppler-20.08.0.patch	2021-04-18 19:03:40 UTC (rev 919936)
@@ -1,42 +0,0 @@
-From 93e85e58b20eef678ac669083042d95f8586c2d6 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at 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