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

[Antonio Rojas]

    Date: Friday, March 22, 2019 @ 09:30:27
  Author: arojas
Revision: 443128

Fix build with poppler 0.75, first try

Added:
  gdal/trunk/gdal-poppler-0.75.patch
Modified:
  gdal/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    8 ++++++--
 gdal-poppler-0.75.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-22 08:19:37 UTC (rev 443127)
+++ PKGBUILD	2019-03-22 09:30:27 UTC (rev 443128)
@@ -20,10 +20,12 @@
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
         gdal-poppler-0.69.0.patch::https://github.com/OSGeo/gdal/commit/69e0701253.patch
-        gdal-perl-vendor.patch)
+        gdal-perl-vendor.patch
+        gdal-poppler-0.75.patch)
 sha256sums=('3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4'
             'cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5'
-            'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3')
+            'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3'
+            '099c95f63863cc8b2c606f146fb145f14599e9f4525fb62d965a5b9bc174a0a2')
 
 prepare() {
   cd "${srcdir}"/$pkgbase-$pkgver
@@ -34,6 +36,8 @@
   find frmts/pdf -type f | xargs sed -e 's|GBool|bool|g' -e 's|gFalse|false|g' -e 's|getCString|c_str|g' -i
 # Fix build with poppler 0.73
   sed -e 's|#include <goo/gtypes.h>|typedef unsigned char Guchar;|' -i frmts/pdf/pdfsdk_headers.h
+# Fix build with poppler 0.75
+  patch -p2 -i ../gdal-poppler-0.75.patch
 
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure

Added: gdal-poppler-0.75.patch
===================================================================
--- gdal-poppler-0.75.patch	                        (rev 0)
+++ gdal-poppler-0.75.patch	2019-03-22 09:30:27 UTC (rev 443128)
@@ -0,0 +1,22 @@
+diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
+index e8929aa181..9e9a76a0d2 100644
+--- a/gdal/frmts/pdf/pdfobject.cpp
++++ b/gdal/frmts/pdf/pdfobject.cpp
+@@ -1190,7 +1190,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
+         return oIter->second;
+ 
+ #ifdef POPPLER_0_58_OR_LATER
+-    Object o = m_poDict->lookupNF(((char*)pszKey));
++    Object o = m_poDict->lookupNF(((char*)pszKey)).copy();
+     if (!o.isNull())
+     {
+         int nRefNum = 0;
+@@ -1324,7 +1324,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
+         return m_v[nIndex];
+ 
+ #ifdef POPPLER_0_58_OR_LATER
+-    Object o = m_poArray->getNF(nIndex);
++    Object o = m_poArray->getNF(nIndex).copy();
+     if( !o.isNull() )
+     {
+         int nRefNum = 0;