Rebuild for poppler-0.67.0
This commit is contained in:
parent
304422c6f3
commit
6e9a6ee2b5
|
@ -0,0 +1,23 @@
|
||||||
|
From 124f0343436d1267319ac627fc220530091b41ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 5 May 2018 22:18:37 +0200
|
||||||
|
Subject: Fix build with recent Poppler (0.64) (fix #573)
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
|
||||||
|
index ae734a74e4..5eab5dd154 100644
|
||||||
|
--- a/frmts/pdf/pdfobject.cpp
|
||||||
|
+++ b/frmts/pdf/pdfobject.cpp
|
||||||
|
@@ -1055,7 +1055,12 @@ const CPLString& GDALPDFObjectPoppler::GetString()
|
||||||
|
{
|
||||||
|
if (GetType() == PDFObjectType_String)
|
||||||
|
{
|
||||||
|
+#ifdef POPPLER_0_58_OR_LATER
|
||||||
|
+ // At least available since poppler 0.41
|
||||||
|
+ const GooString* gooString = m_po->getString();
|
||||||
|
+#else
|
||||||
|
GooString* gooString = m_po->getString();
|
||||||
|
+#endif
|
||||||
|
return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
|
||||||
|
static_cast<int>(gooString->getLength())));
|
||||||
|
}
|
|
@ -62,7 +62,7 @@
|
||||||
|
|
||||||
Name: gdal
|
Name: gdal
|
||||||
Version: 2.2.4
|
Version: 2.2.4
|
||||||
Release: 9%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
Release: 10%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
||||||
Summary: GIS file format library
|
Summary: GIS file format library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: MIT
|
License: MIT
|
||||||
|
@ -91,6 +91,7 @@ Patch8: %{name}-1.9.0-java.patch
|
||||||
|
|
||||||
Patch9: %{name}-2.2.2-zlib.patch
|
Patch9: %{name}-2.2.2-zlib.patch
|
||||||
|
|
||||||
|
Patch10: %{name}-2.2.4-poppler-0.64.0.patch
|
||||||
|
|
||||||
BuildRequires: gcc gcc-c++
|
BuildRequires: gcc gcc-c++
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
|
@ -328,6 +329,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4
|
||||||
%patch3 -p1 -b .completion~
|
%patch3 -p1 -b .completion~
|
||||||
%patch8 -p1 -b .java~
|
%patch8 -p1 -b .java~
|
||||||
%patch9 -p1 -b .zlib~
|
%patch9 -p1 -b .zlib~
|
||||||
|
%patch10 -p1 -b .poppler~
|
||||||
|
|
||||||
# Copy in PROVENANCE.TXT-fedora
|
# Copy in PROVENANCE.TXT-fedora
|
||||||
cp -p %SOURCE4 .
|
cp -p %SOURCE4 .
|
||||||
|
@ -875,6 +877,9 @@ popd
|
||||||
#Or as before, using ldconfig
|
#Or as before, using ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 14 2018 Marek Kasik <mkasik@redhat.com> - 2.2.4-10
|
||||||
|
- Rebuild for poppler-0.67.0
|
||||||
|
|
||||||
* Wed Jul 25 2018 Devrim Gündüz <devrim@gunduz.org> - 2.2.4-9
|
* Wed Jul 25 2018 Devrim Gündüz <devrim@gunduz.org> - 2.2.4-9
|
||||||
- Fix #1606875
|
- Fix #1606875
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue