- up to 3.0.4

diff --git a/gdal.spec b/gdal.spec
index 20e39d0f2405a9f66fc8616e234f7e5939a07ab6..8795888e9aea826890f4b3206755ba4706e753ba 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -49,19 +49,18 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
-Version:       3.0.1
-Release:       6
+Version:       3.0.4
+Release:       1
 License:       BSD-like
 Group:         Libraries
 Source0:       https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2b397c041e6b0b10ec7c49fd76e9fa99
+# Source0-md5: c6bbb5caca06e96bd97a32918e0aa9aa
 Patch0:                %{name}-perl.patch
 Patch1:                %{name}-pc.patch
 Patch2:                %{name}-dds.patch
 Patch3:                %{name}-rasdaman.patch
 Patch4:                %{name}-pluginsdir.patch
 Patch5:                libx32.patch
-Patch6:                poppler-0.82.patch
 Patch7:                decl.patch
 URL:           http://www.gdal.org/
 # 1.x or 2.x supported
@@ -273,7 +272,6 @@ Moduł Pythona GDAL.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
 %patch7 -p1
 
 # need to regenerate (old ones don't support perl 5.10)

diff --git a/poppler-0.82.patch b/poppler-0.82.patch
deleted file mode 100644 (file)
index 1c4a651..0000000
--- a/poppler-0.82.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@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,
-From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@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,