commit: 069b69a6097d8e2e6e9f62cd93efd9edcad725f1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 1 18:52:56 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 1 18:52:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069b69a6
sci-libs/gdal: Fix build with poppler-0.82.0 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch | 53 +++++++++++++++++++++++ sci-libs/gdal/gdal-2.4.1-r1.ebuild | 1 + 2 files changed, 54 insertions(+) diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch new file mode 100644 index 00000000000..740856814f8 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch @@ -0,0 +1,53 @@ +From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001 +From: Even Rouault <[email protected]> +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/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index 15537ca7fd7..8f944c40d30 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/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, +From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001 +From: Even Rouault <[email protected]> +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/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index 3d68f92abe8..b3db5374227 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/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, diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild index 2c9beae3deb..db767c561b7 100644 --- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild +++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild @@ -85,6 +85,7 @@ PATCHES=( "${FILESDIR}/${P}-poppler-0.75.patch" "${FILESDIR}/${P}-poppler-0.76.patch" "${FILESDIR}/${P}-swig-4.patch" # bug 689110 + "${FILESDIR}/${P}-poppler-0.82.patch" ) src_prepare() {
