commit: 5a472b33715bba5a1d60a478b5a5c43a5e5dc7d2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Apr 24 13:18:03 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Apr 24 13:18:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a472b33
media-gfx/inkscape: Fixed build with app-text/poppler-0.76.0 Closes: https://bugs.gentoo.org/684246 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/inkscape-0.92.4-poppler-0.76.0.patch | 44 ++++++++++++++++++++++ media-gfx/inkscape/inkscape-0.92.4.ebuild | 1 + 2 files changed, 45 insertions(+) diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch new file mode 100644 index 00000000000..11383d9aa33 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch @@ -0,0 +1,44 @@ +From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 +From: Marc Jeanmougin <[email protected]> +Date: Wed, 24 Apr 2019 14:11:26 +0200 +Subject: [PATCH] Tentative fix for poppler 0.76 + +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- + src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 2981d6ee51..ddbff7671f 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new _POPPLER_NEW_PARSER(xref, obj); + go(topLevel); + delete parser; + parser = NULL; +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 6e4dde7dee..21a60702fa 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -3,6 +3,13 @@ + + #include <glib/poppler-features.h> + ++#if POPPLER_CHECK_VERSION(0, 76, 0) ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) ++#else ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) ++#endif ++ ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif +-- +2.18.1 + diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild index b4bddca2ef6..7d775127ec3 100644 --- a/media-gfx/inkscape/inkscape-0.92.4.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild @@ -97,6 +97,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.91_pre3-exif.patch" "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" "${FILESDIR}/${PN}-0.48.4-epython.patch" + "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 ) S="${WORKDIR}/${MY_P}"
