Date: Tuesday, April 23, 2019 @ 21:47:44 Author: arojas Revision: 453244
Fix build with poppler 0.76 Added: gdal/trunk/gdal-poppler-0.76.patch Modified: gdal/trunk/PKGBUILD -------------------------+ PKGBUILD | 8 ++++++-- gdal-poppler-0.76.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-23 21:03:27 UTC (rev 453243) +++ PKGBUILD 2019-04-23 21:47:44 UTC (rev 453244) @@ -21,11 +21,13 @@ 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-poppler-0.75.patch) + gdal-poppler-0.75.patch + gdal-poppler-0.76.patch) sha256sums=('3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4' 'cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5' 'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3' - '099c95f63863cc8b2c606f146fb145f14599e9f4525fb62d965a5b9bc174a0a2') + '099c95f63863cc8b2c606f146fb145f14599e9f4525fb62d965a5b9bc174a0a2' + '5dcf665ba33d6d7880be3ab3371f2fd916a70f49f711b06da3c67e3eb3541d9a') prepare() { cd "${srcdir}"/$pkgbase-$pkgver @@ -38,6 +40,8 @@ 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 build with poppler 0.76 + patch -p2 -i ../gdal-poppler-0.76.patch # Fix mandir sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure Added: gdal-poppler-0.76.patch =================================================================== --- gdal-poppler-0.76.patch (rev 0) +++ gdal-poppler-0.76.patch 2019-04-23 21:47:44 UTC (rev 453244) @@ -0,0 +1,34 @@ +diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp +index 6e8223e470..16651ee2a3 100644 +--- a/gdal/frmts/pdf/pdfdataset.cpp ++++ b/gdal/frmts/pdf/pdfdataset.cpp +@@ -3452,7 +3452,7 @@ void PDFDataset::FindLayersPoppler() + { + auto ocg = refOCGPair.second.get(); + #else +- GooList* ocgList = optContentConfig->getOCGs(); ++ std::vector<void*> ocgList = optContentConfig->getOCGs(); + for(int i=0;i<ocgList->getLength();i++) + { + OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i); +@@ -3490,7 +3490,7 @@ void PDFDataset::TurnLayersOnOffPoppler() + { + auto ocg = refOCGPair.second.get(); + #else +- GooList* ocgList = optContentConfig->getOCGs(); ++ std::vector<void*> ocgList = optContentConfig->getOCGs(); + for(i=0;i<ocgList->getLength();i++) + { + OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i); +diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/gdal/frmts/pdf/pdfsdk_headers.h +index 9150b0f410..1311636f7b 100644 +--- a/gdal/frmts/pdf/pdfsdk_headers.h ++++ b/gdal/frmts/pdf/pdfsdk_headers.h +@@ -51,7 +51,6 @@ + #endif + + typedef unsigned char Guchar; +-#include <goo/GooList.h> + + /* begin of poppler xpdf includes */ + #include <poppler/Object.h>