Date: Monday, November 11, 2019 @ 23:12:55 Author: foutrelis Revision: 526856
Fix build with poppler 0.82 Added: gdal/trunk/poppler-0.82.patch Modified: gdal/trunk/PKGBUILD --------------------+ PKGBUILD | 5 ++++ poppler-0.82.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-11 23:05:30 UTC (rev 526855) +++ PKGBUILD 2019-11-11 23:12:55 UTC (rev 526856) @@ -19,8 +19,10 @@ options=('!emptydirs') changelog=$pkgbase.changelog source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz + poppler-0.82.patch gdal-perl-vendor.patch) sha256sums=('45b4ae25dbd87282d589eca76481c426f72132d7a599556470d5c38263b09266' + '82acfb6cf822dcf05ea08cc7baf98d3bd8e19c447acff49cf3ea73fc81904ae0' '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed') prepare() { @@ -29,6 +31,9 @@ # Fix mandir sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure +# Fix build with poppler 0.82 + patch -Np2 -i "${srcdir}"/poppler-0.82.patch + # Fix Perl bindings installation path patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch } Added: poppler-0.82.patch =================================================================== --- poppler-0.82.patch (rev 0) +++ poppler-0.82.patch 2019-11-11 23:12:55 UTC (rev 526856) @@ -0,0 +1,54 @@ +From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.roua...@spatialys.com> +Date: Sun, 29 Sep 2019 23:55:18 +0200 +Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp +index 3d68f92abe8..b3db5374227 100644 +--- a/gdal/frmts/pdf/pdfdataset.cpp ++++ b/gdal/frmts/pdf/pdfdataset.cpp +@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev + + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg) override ++ GBool interpolate, ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 ++ const ++#endif ++ int *maskColors, ++ GBool inlineImg) override + { + if (bEnableBitmap) + SplashOutputDev::drawImage(state, ref, str, + +From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.roua...@spatialys.com> +Date: Tue, 22 Oct 2019 13:11:57 +0200 +Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp +index 15537ca7fd7..8f944c40d30 100644 +--- a/gdal/frmts/pdf/pdfdataset.cpp ++++ b/gdal/frmts/pdf/pdfdataset.cpp +@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev + virtual void drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode code, int nBytes, Unicode *u, int uLen) override ++ CharCode code, int nBytes, ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 ++ const ++#endif ++ Unicode *u, int uLen) override + { + if (bEnableText) + SplashOutputDev::drawChar(state, x, y, dx, dy,