diff options
| author |   Sam James <sam@gentoo.org> | 2021-11-06 21:06:08 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-11-06 21:06:34 +0000 |
| commit | 22cd821e55975b479094132da6a319e1fb15f3cd (patch) | |
| tree | ddb669c8c417791a35522ad1472878e16366d84f /media-gfx/inkscape | |
| parent | package.mask: Last rite app-pda/gnupod (diff) | |
| download | gentoo-22cd821e55975b479094132da6a319e1fb15f3cd.tar.gz gentoo-22cd821e55975b479094132da6a319e1fb15f3cd.tar.bz2 gentoo-22cd821e55975b479094132da6a319e1fb15f3cd.zip | |
media-gfx/inkscape: fix build with Poppler 21.11.0
Closes: https://bugs.gentoo.org/822129
Thanks-to: Stephan Hartmann <sultan@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/inkscape')
| -rw-r--r-- | media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch | 20 | ||||
| -rw-r--r-- | media-gfx/inkscape/inkscape-1.1.ebuild | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch new file mode 100644 index 000000000000..7b02253d5f9a --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch @@ -0,0 +1,20 @@ +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Mon, 1 Nov 2021 21:45:38 +0200 +Subject: [PATCH] Fix build with poppler 21.11.0 + +GfxFont::tag is now of type std::string instead of GooString *. +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", ++#if POPPLER_CHECK_VERSION(21,11,0) ++ font->getTag().c_str(), ++#else + font->getTag()->getCString(), ++#endif + font->getName() ? font->getName()->getCString() : "???", + args[1].getNum()); + fflush(stdout); +GitLab diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild index e62f8efdec2c..0a00c0afef43 100644 --- a/media-gfx/inkscape/inkscape-1.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.1.ebuild @@ -110,6 +110,7 @@ pkg_pretend() { src_prepare() { # Backport from master eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch + eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch cmake_src_prepare sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die |