commit: 71d24a3fbd8beda6755d42591454ba29221f29f0 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri May 25 09:33:55 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri May 25 09:35:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d24a3f
media-gfx/inkscape: Fixed build against ~app-text/poppler-0.65.0 Bug: https://bugs.gentoo.org/656266 Package-Manager: Portage-2.3.39, Repoman-2.3.9 .../files/inkscape-0.92.3-poppler-0.65.patch | 29 ++++++++++++++++++++++ media-gfx/inkscape/inkscape-0.92.3.ebuild | 1 + 2 files changed, 30 insertions(+) diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch new file mode 100644 index 00000000000..86d9e48396d --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch @@ -0,0 +1,29 @@ +From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001 +From: Jan Palus <[email protected]> +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: [PATCH] Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus <[email protected]> +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 6c498f9..caaeca1 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -37,8 +37,7 @@ extern "C" { + #include "util/units.h" + + #include "goo/gmem.h" +-#include "goo/GooTimer.h" +-#include "goo/GooHash.h" ++#include "goo/GooString.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" +-- +2.17.0 + diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild index 97020416d36..89ad5363774 100644 --- a/media-gfx/inkscape/inkscape-0.92.3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild @@ -101,6 +101,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.48.4-epython.patch" "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch" + "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch" ) S="${WORKDIR}/${MY_P}"
