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

[Jaroslav Lichtblau]

    Date: Monday, July 2, 2018 @ 19:50:08
  Author: jlichtblau
Revision: 350219

upgpkg: gdal 2.3.1-1 - new upstream release

Modified:
  gdal/trunk/PKGBUILD
  gdal/trunk/gdal-perl-vendor.patch
  gdal/trunk/gdal.changelog
Deleted:
  gdal/trunk/gdal-poppler-0.64.patch

-------------------------+
 PKGBUILD                |   13 +++++--------
 gdal-perl-vendor.patch  |    2 +-
 gdal-poppler-0.64.patch |   13 -------------
 gdal.changelog          |    3 +++
 4 files changed, 9 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-02 19:49:28 UTC (rev 350218)
+++ PKGBUILD	2018-07-02 19:50:08 UTC (rev 350219)
@@ -5,8 +5,8 @@
 
 pkgbase=gdal
 pkgname=(gdal python-gdal python2-gdal)
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('x86_64')
 url="http://www.gdal.org/"
@@ -20,10 +20,9 @@
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
-        gdal-perl-vendor.patch gdal-poppler-0.64.patch)
-sha512sums=('7eb5abd9e61fca2ac8c7022029b2492b98f56873ffd277e15ced23d3742e26fd29eb5f8ed7c916b096c3caeed9efc03d0c022390fa0bf762d0c6cb5c04e70ec7'
-            '16334ff8d208da6549228ae709c2a34e1adea19e93141bcab258805cbcdc3b4243c9d3bf0cecbf0d5ea89e2e65351d6a990efbdf7ceab4ce7a970deb15cd7894'
-            '26af0e8c8217b11816a44d62d438b0b5b1a94a36de827a7f6bb6d38d8c4899a20e3df7a979af2c81445c0c4359d9cd6c3f479e4c0558e6d36fde313546acabe7')
+        gdal-perl-vendor.patch)
+sha256sums=('9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a'
+            'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3')
 
 prepare() {
   cd "${srcdir}"/$pkgbase-$pkgver
@@ -33,8 +32,6 @@
 
 # Fix Perl bindings installation path
   patch -Np1 -i ../gdal-perl-vendor.patch
-# Fix build with poppler 0.64
-  patch -p2 -i ../gdal-poppler-0.64.patch
 }
 
 build() {

Modified: gdal-perl-vendor.patch
===================================================================
--- gdal-perl-vendor.patch	2018-07-02 19:49:28 UTC (rev 350218)
+++ gdal-perl-vendor.patch	2018-07-02 19:50:08 UTC (rev 350219)
@@ -20,7 +20,7 @@
 @@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
  gdal_wrap.cc: generate
  
- Makefile_Geo__GDAL:
+ Makefile_Geo__GDAL: gdal_wrap.cc
 -	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
 +	perl Makefile.PL INSTALLDIRS=vendor
  

Deleted: gdal-poppler-0.64.patch
===================================================================
--- gdal-poppler-0.64.patch	2018-07-02 19:49:28 UTC (rev 350218)
+++ gdal-poppler-0.64.patch	2018-07-02 19:50:08 UTC (rev 350219)
@@ -1,13 +0,0 @@
-diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
-index ae734a74e4..c5a9935c00 100644
---- a/gdal/frmts/pdf/pdfobject.cpp
-+++ b/gdal/frmts/pdf/pdfobject.cpp
-@@ -1055,7 +1055,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
- {
-     if (GetType() == PDFObjectType_String)
-     {
--        GooString* gooString = m_po->getString();
-+        const GooString* gooString = m_po->getString();
-         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-                                                       static_cast<int>(gooString->getLength())));
-     }

Modified: gdal.changelog
===================================================================
--- gdal.changelog	2018-07-02 19:49:28 UTC (rev 350218)
+++ gdal.changelog	2018-07-02 19:50:08 UTC (rev 350219)
@@ -1,3 +1,6 @@
+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