[arch-commits] Commit in gdal/trunk (4 files)

[Antonio Rojas]

    Date: Wednesday, May 22, 2019 @ 17:19:22
  Author: arojas
Revision: 468615

Update to 2.4.1, cfitsio 3.47 rebuild

Modified:
  gdal/trunk/PKGBUILD
  gdal/trunk/gdal-perl-vendor.patch
  gdal/trunk/gdal-poppler-0.75.patch
  gdal/trunk/gdal-poppler-0.76.patch

-------------------------+
 PKGBUILD                |   30 +++++++-----------------------
 gdal-perl-vendor.patch  |    4 ++--
 gdal-poppler-0.75.patch |    4 ++--
 gdal-poppler-0.76.patch |    4 ++--
 4 files changed, 13 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-22 17:16:26 UTC (rev 468614)
+++ PKGBUILD	2019-05-22 17:19:22 UTC (rev 468615)
@@ -4,8 +4,8 @@
 
 pkgbase=gdal
 pkgname=('gdal' 'python-gdal' 'python2-gdal')
-pkgver=2.3.2
-pkgrel=13
+pkgver=2.4.1
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('x86_64')
 url="http://www.gdal.org/"
@@ -19,25 +19,15 @@
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
-        gdal-poppler-0.69.0.patch::https://github.com/OSGeo/gdal/commit/69e0701253.patch
-        gdal-perl-vendor.patch
-        gdal-poppler-0.75.patch
-        gdal-poppler-0.76.patch)
-sha256sums=('3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4'
-            'cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5'
-            'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3'
-            '099c95f63863cc8b2c606f146fb145f14599e9f4525fb62d965a5b9bc174a0a2'
-            '5dcf665ba33d6d7880be3ab3371f2fd916a70f49f711b06da3c67e3eb3541d9a')
+        gdal-perl-vendor.patch gdal-poppler-0.75.patch gdal-poppler-0.76.patch)
+sha256sums=('fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad'
+            '9aae00cdb8804dabc0d5d1921e874377daa2fc16677d743845e7b96f2901c1ea'
+            'adb5a5918a986beb5b506180619c63f2655e99d3561b94f998248419d612fd51'
+            '43a5967fdb56c726a4865032c1d9e5771f7b21b4867e0ec05e37a259811fbca5')
 
 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 build with poppler 0.75
   patch -p2 -i ../gdal-poppler-0.75.patch
 # Fix build with poppler 0.76
@@ -54,12 +44,6 @@
   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-perl --with-geos \
               --with-png --with-poppler --with-spatialite --with-openjpeg

Modified: gdal-perl-vendor.patch
===================================================================
--- gdal-perl-vendor.patch	2019-05-22 17:16:26 UTC (rev 468614)
+++ gdal-perl-vendor.patch	2019-05-22 17:19:22 UTC (rev 468615)
@@ -18,9 +18,9 @@
 --- a/swig/perl/GNUmakefile
 +++ b/swig/perl/GNUmakefile
 @@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
- gdal_wrap.cc: generate
+ 	if [ -f Makefile_Geo__GNM ]; then $(MAKE) -f Makefile_Geo__GNM; fi
  
- Makefile_Geo__GDAL: gdal_wrap.cc
+ Makefile_Geo__GDAL: ${WRAPPERS} Makefile.PL
 -	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
 +	perl Makefile.PL INSTALLDIRS=vendor
  

Modified: gdal-poppler-0.75.patch
===================================================================
--- gdal-poppler-0.75.patch	2019-05-22 17:16:26 UTC (rev 468614)
+++ gdal-poppler-0.75.patch	2019-05-22 17:19:22 UTC (rev 468615)
@@ -5,7 +5,7 @@
 @@ -1190,7 +1190,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
          return oIter->second;
  
- #ifdef POPPLER_0_58_OR_LATER
+ #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
 -    Object o = m_poDict->lookupNF(((char*)pszKey));
 +    Object o = m_poDict->lookupNF(((char*)pszKey)).copy();
      if (!o.isNull())
@@ -14,7 +14,7 @@
 @@ -1324,7 +1324,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
          return m_v[nIndex];
  
- #ifdef POPPLER_0_58_OR_LATER
+ #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
 -    Object o = m_poArray->getNF(nIndex);
 +    Object o = m_poArray->getNF(nIndex).copy();
      if( !o.isNull() )

Modified: gdal-poppler-0.76.patch
===================================================================
--- gdal-poppler-0.76.patch	2019-05-22 17:16:26 UTC (rev 468614)
+++ gdal-poppler-0.76.patch	2019-05-22 17:19:22 UTC (rev 468615)
@@ -25,9 +25,9 @@
 --- a/gdal/frmts/pdf/pdfsdk_headers.h
 +++ b/gdal/frmts/pdf/pdfsdk_headers.h
 @@ -51,7 +51,6 @@
+ #else
+ typedef unsigned char Guchar;
  #endif
- 
- typedef unsigned char Guchar;
 -#include <goo/GooList.h>
  
  /* begin of poppler xpdf includes */