| 1 |
commit: 069b69a6097d8e2e6e9f62cd93efd9edcad725f1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 1 18:52:56 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 1 18:52:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069b69a6 |
| 7 |
|
| 8 |
sci-libs/gdal: Fix build with poppler-0.82.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch | 53 +++++++++++++++++++++++ |
| 14 |
sci-libs/gdal/gdal-2.4.1-r1.ebuild | 1 + |
| 15 |
2 files changed, 54 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..740856814f8 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch |
| 22 |
@@ -0,0 +1,53 @@ |
| 23 |
+From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Even Rouault <even.rouault@×××××××××.com> |
| 25 |
+Date: Tue, 22 Oct 2019 13:11:57 +0200 |
| 26 |
+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ gdal/frmts/pdf/pdfdataset.cpp | 6 +++++- |
| 30 |
+ 1 file changed, 5 insertions(+), 1 deletion(-) |
| 31 |
+ |
| 32 |
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp |
| 33 |
+index 15537ca7fd7..8f944c40d30 100644 |
| 34 |
+--- a/frmts/pdf/pdfdataset.cpp |
| 35 |
++++ b/frmts/pdf/pdfdataset.cpp |
| 36 |
+@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev |
| 37 |
+ virtual void drawChar(GfxState *state, double x, double y, |
| 38 |
+ double dx, double dy, |
| 39 |
+ double originX, double originY, |
| 40 |
+- CharCode code, int nBytes, Unicode *u, int uLen) override |
| 41 |
++ CharCode code, int nBytes, |
| 42 |
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 |
| 43 |
++ const |
| 44 |
++#endif |
| 45 |
++ Unicode *u, int uLen) override |
| 46 |
+ { |
| 47 |
+ if (bEnableText) |
| 48 |
+ SplashOutputDev::drawChar(state, x, y, dx, dy, |
| 49 |
+From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001 |
| 50 |
+From: Even Rouault <even.rouault@×××××××××.com> |
| 51 |
+Date: Sun, 29 Sep 2019 23:55:18 +0200 |
| 52 |
+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev |
| 53 |
+ |
| 54 |
+--- |
| 55 |
+ gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++- |
| 56 |
+ 1 file changed, 6 insertions(+), 1 deletion(-) |
| 57 |
+ |
| 58 |
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp |
| 59 |
+index 3d68f92abe8..b3db5374227 100644 |
| 60 |
+--- a/frmts/pdf/pdfdataset.cpp |
| 61 |
++++ b/frmts/pdf/pdfdataset.cpp |
| 62 |
+@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev |
| 63 |
+ |
| 64 |
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str, |
| 65 |
+ int width, int height, GfxImageColorMap *colorMap, |
| 66 |
+- GBool interpolate, int *maskColors, GBool inlineImg) override |
| 67 |
++ GBool interpolate, |
| 68 |
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 |
| 69 |
++ const |
| 70 |
++#endif |
| 71 |
++ int *maskColors, |
| 72 |
++ GBool inlineImg) override |
| 73 |
+ { |
| 74 |
+ if (bEnableBitmap) |
| 75 |
+ SplashOutputDev::drawImage(state, ref, str, |
| 76 |
|
| 77 |
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild |
| 78 |
index 2c9beae3deb..db767c561b7 100644 |
| 79 |
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild |
| 80 |
+++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild |
| 81 |
@@ -85,6 +85,7 @@ PATCHES=( |
| 82 |
"${FILESDIR}/${P}-poppler-0.75.patch" |
| 83 |
"${FILESDIR}/${P}-poppler-0.76.patch" |
| 84 |
"${FILESDIR}/${P}-swig-4.patch" # bug 689110 |
| 85 |
+ "${FILESDIR}/${P}-poppler-0.82.patch" |
| 86 |
) |
| 87 |
|
| 88 |
src_prepare() { |
Archives