- fix building with poppler 0.31+ (patch from Arch)

- rel 4

diff --git a/gdal.spec b/gdal.spec
index e53f7731caa8afa74fca09dd7a3e4e9ce884cc18..738e38623a2ec1244b70e5828bbc9a9c4dcd00b4 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -49,7 +49,7 @@ Summary:      Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
 Version:       1.11.2
-Release:       3
+Release:       4
 License:       BSD-like
 Group:         Libraries
 Source0:       http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
@@ -67,6 +67,7 @@ Patch9:               %{name}-dds.patch
 Patch11:       %{name}-armadillo.patch
 Patch12:       %{name}-rasdaman.patch
 Patch13:       %{name}-pluginsdir.patch
+Patch14:       poppler-0.31.patch
 URL:           http://www.gdal.org/
 %{?with_php:BuildRequires:     %{php_name}-devel}
 %{?with_opencl:BuildRequires:  OpenCL-devel >= 1.0}
@@ -294,6 +295,7 @@ osr.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # need to regenerate (old ones don't support perl 5.10 or php 5.5)
 %{__rm} swig/{perl,php}/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}

diff --git a/poppler-0.31.patch b/poppler-0.31.patch
new file mode 100644 (file)
index 0000000..fff2346
--- /dev/null
+++ b/poppler-0.31.patch
@@ -0,0 +1,12 @@
+diff -Nur gdal-1.11.2/frmts/pdf/pdfdataset.cpp gdal-1.11.2a/frmts/pdf/pdfdataset.cpp
+--- gdal-1.11.2/frmts/pdf/pdfdataset.cpp       2015-02-10 13:11:19.000000000 +0100
++++ gdal-1.11.2a/frmts/pdf/pdfdataset.cpp      2015-03-02 18:38:25.170155277 +0100
+@@ -113,7 +113,7 @@
+                          GBool allowAntialiasA = gTrue) :
+                 SplashOutputDev(colorModeA, bitmapRowPadA,
+                                 reverseVideoA, paperColorA,
+-                                bitmapTopDownA, allowAntialiasA),
++                                bitmapTopDownA),
+                 bEnableVector(TRUE),
+                 bEnableText(TRUE),
+                 bEnableBitmap(TRUE) {}