diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-16 21:00:55 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-16 21:01:16 +0100 |
| commit | 1da4ee6b2a34b6802387a67583960a84f946ae53 (patch) | |
| tree | 11e26e6143236274e6c870c6a0129e6b7f9a1df4 | |
| parent | media-gfx/inkscape: Switch to upstream poppler-0.72 fix (diff) | |
| download | gentoo-1da4ee6b.tar.gz gentoo-1da4ee6b.tar.bz2 gentoo-1da4ee6b.zip | |
sci-libs/gdal: Fix build with poppler-0.73
Closes: https://bugs.gentoo.org/675450
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch | 35 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-2.3.1.ebuild | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch new file mode 100644 index 000000000000..8529d99e7351 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch @@ -0,0 +1,35 @@ +From 77ea05388924fcf2a8c9fd4a777c97e4d69f5e17 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 16 Jan 2019 20:52:59 +0100 +Subject: [PATCH] Fix build with poppler-0.73 + +--- + gdal/frmts/pdf/pdfsdk_headers.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h +index 9150b0f410..574943b41f 100644 +--- a/frmts/pdf/pdfsdk_headers.h ++++ b/frmts/pdf/pdfsdk_headers.h +@@ -50,7 +50,6 @@ + #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */ + #endif + +-#include <goo/gtypes.h> + #include <goo/GooList.h> + + /* begin of poppler xpdf includes */ +@@ -79,6 +78,10 @@ + + /* end of poppler xpdf includes */ + ++/* poppler-0.73 compatibility */ ++#define Guchar unsigned char ++#define Guint unsigned int ++ + #ifdef _MSC_VER + #pragma warning( pop ) + #endif +-- +2.20.1 + diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild index 7af0dee08518..9f81394be026 100644 --- a/sci-libs/gdal/gdal-2.3.1.ebuild +++ b/sci-libs/gdal/gdal-2.3.1.ebuild @@ -122,6 +122,8 @@ src_prepare() { # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12: has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch" + # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16: + has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch" eautoreconf } |