Date: Tuesday, April 24, 2018 @ 21:04:30 Author: arojas Revision: 317626
poppler 0.64 rebuild Added: gdal/trunk/gdal-poppler-0.64.patch Modified: gdal/trunk/PKGBUILD -------------------------+ PKGBUILD | 9 ++++++--- gdal-poppler-0.64.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-24 20:32:53 UTC (rev 317625) +++ PKGBUILD 2018-04-24 21:04:30 UTC (rev 317626) @@ -6,7 +6,7 @@ pkgbase=gdal pkgname=(gdal python-gdal python2-gdal) pkgver=2.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A translator library for raster geospatial data formats" arch=('x86_64') url="http://www.gdal.org/" @@ -20,9 +20,10 @@ options=('!emptydirs') changelog=$pkgbase.changelog source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz - gdal-perl-vendor.patch) + gdal-perl-vendor.patch gdal-poppler-0.64.patch) sha256sums=('441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278' - '20989e5fa499206b42c92280ce084fdf7b2f661a4233fc349611cc57102fe114') + '20989e5fa499206b42c92280ce084fdf7b2f661a4233fc349611cc57102fe114' + '34d7909e1375aa407936374d65a561a6803b59b1280be7f878fb45049f629b40') prepare() { cd "${srcdir}"/$pkgbase-$pkgver @@ -32,6 +33,8 @@ # Fix Perl bindings installation path patch -Np1 -i ../gdal-perl-vendor.patch +# Fix build with poppler 0.64 + patch -p2 -i ../gdal-poppler-0.64.patch } build() { Added: gdal-poppler-0.64.patch =================================================================== --- gdal-poppler-0.64.patch (rev 0) +++ gdal-poppler-0.64.patch 2018-04-24 21:04:30 UTC (rev 317626) @@ -0,0 +1,13 @@ +diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp +index ae734a74e4..c5a9935c00 100644 +--- a/gdal/frmts/pdf/pdfobject.cpp ++++ b/gdal/frmts/pdf/pdfobject.cpp +@@ -1055,7 +1055,7 @@ const CPLString& GDALPDFObjectPoppler::GetString() + { + if (GetType() == PDFObjectType_String) + { +- GooString* gooString = m_po->getString(); ++ const GooString* gooString = m_po->getString(); + return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()), + static_cast<int>(gooString->getLength()))); + }