gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sci-libs/gdal: Fix build with poppler-0.82.0

Browse Source 
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2019-11-01 19:52:56 +01:00
parent 7341b195af
commit 069b69a609
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch Normal file
View File

@@ -0,0 +1,53 @@
From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@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/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 <even.rouault@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/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,

1
sci-libs/gdal/gdal-2.4.1-r1.ebuild
View File

@@ -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() {