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

[Jaroslav Lichtblau]

    Date: Wednesday, November 27, 2019 @ 21:35:58
  Author: jlichtblau
Revision: 534212

upgpkg: gdal 3.0.2-1 - new upstream release

Modified:
  gdal/trunk/PKGBUILD
  gdal/trunk/gdal.changelog
Deleted:
  gdal/trunk/poppler-0.82.patch

--------------------+
 PKGBUILD           |   11 ++--------
 gdal.changelog     |    3 ++
 poppler-0.82.patch |   54 ---------------------------------------------------
 3 files changed, 6 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-27 21:20:06 UTC (rev 534211)
+++ PKGBUILD	2019-11-27 21:35:58 UTC (rev 534212)
@@ -4,8 +4,8 @@
 
 pkgbase=gdal
 pkgname=('gdal' 'python-gdal')
-pkgver=3.0.1
-pkgrel=4
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('x86_64')
 url="http://www.gdal.org/"
@@ -19,10 +19,8 @@
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
-        poppler-0.82.patch
         gdal-perl-vendor.patch)
-sha256sums=('45b4ae25dbd87282d589eca76481c426f72132d7a599556470d5c38263b09266'
-            '82acfb6cf822dcf05ea08cc7baf98d3bd8e19c447acff49cf3ea73fc81904ae0'
+sha256sums=('c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -31,9 +29,6 @@
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 
-# Fix build with poppler 0.82
-  patch -Np2 -i "${srcdir}"/poppler-0.82.patch
-
 # Fix Perl bindings installation path
   patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch
 }

Modified: gdal.changelog
===================================================================
--- gdal.changelog	2019-11-27 21:20:06 UTC (rev 534211)
+++ gdal.changelog	2019-11-27 21:35:58 UTC (rev 534212)
@@ -1,3 +1,6 @@
+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
 

Deleted: poppler-0.82.patch
===================================================================
--- poppler-0.82.patch	2019-11-27 21:20:06 UTC (rev 534211)
+++ poppler-0.82.patch	2019-11-27 21:35:58 UTC (rev 534212)
@@ -1,54 +0,0 @@
-From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Sun, 29 Sep 2019 23:55:18 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
-index 3d68f92abe8..b3db5374227 100644
---- a/gdal/frmts/pdf/pdfdataset.cpp
-+++ b/gdal/frmts/pdf/pdfdataset.cpp
-@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
- 
-         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-                                int width, int height, GfxImageColorMap *colorMap,
--                               GBool interpolate, int *maskColors, GBool inlineImg) override
-+                               GBool interpolate,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+                               const
-+#endif
-+                               int *maskColors,
-+                               GBool inlineImg) override
-         {
-             if (bEnableBitmap)
-                 SplashOutputDev::drawImage(state, ref, str,
-
-From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Tue, 22 Oct 2019 13:11:57 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
-index 15537ca7fd7..8f944c40d30 100644
---- a/gdal/frmts/pdf/pdfdataset.cpp
-+++ b/gdal/frmts/pdf/pdfdataset.cpp
-@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
-         virtual void drawChar(GfxState *state, double x, double y,
-                               double dx, double dy,
-                               double originX, double originY,
--                              CharCode code, int nBytes, Unicode *u, int uLen) override
-+                              CharCode code, int nBytes,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+                              const
-+#endif
-+                              Unicode *u, int uLen) override
-         {
-             if (bEnableText)
-                 SplashOutputDev::drawChar(state, x, y, dx, dy,