| 1 |
commit: 22cd821e55975b479094132da6a319e1fb15f3cd |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 6 21:06:08 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 21:06:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cd821e |
| 7 |
|
| 8 |
media-gfx/inkscape: fix build with Poppler 21.11.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/822129 |
| 11 |
Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/inkscape-1.1-poppler-21.11.0.patch | 20 ++++++++++++++++++++ |
| 15 |
media-gfx/inkscape/inkscape-1.1.ebuild | 1 + |
| 16 |
2 files changed, 21 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..7b02253d5f9 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch |
| 23 |
@@ -0,0 +1,20 @@ |
| 24 |
+From: Evangelos Foutras <evangelos@×××××××××.com> |
| 25 |
+Date: Mon, 1 Nov 2021 21:45:38 +0200 |
| 26 |
+Subject: [PATCH] Fix build with poppler 21.11.0 |
| 27 |
+ |
| 28 |
+GfxFont::tag is now of type std::string instead of GooString *. |
| 29 |
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp |
| 30 |
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp |
| 31 |
+@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) |
| 32 |
+ } |
| 33 |
+ if (printCommands) { |
| 34 |
+ printf(" font: tag=%s name='%s' %g\n", |
| 35 |
++#if POPPLER_CHECK_VERSION(21,11,0) |
| 36 |
++ font->getTag().c_str(), |
| 37 |
++#else |
| 38 |
+ font->getTag()->getCString(), |
| 39 |
++#endif |
| 40 |
+ font->getName() ? font->getName()->getCString() : "???", |
| 41 |
+ args[1].getNum()); |
| 42 |
+ fflush(stdout); |
| 43 |
+GitLab |
| 44 |
|
| 45 |
diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild |
| 46 |
index e62f8efdec2..0a00c0afef4 100644 |
| 47 |
--- a/media-gfx/inkscape/inkscape-1.1.ebuild |
| 48 |
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild |
| 49 |
@@ -110,6 +110,7 @@ pkg_pretend() { |
| 50 |
src_prepare() { |
| 51 |
# Backport from master |
| 52 |
eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch |
| 53 |
+ eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch |
| 54 |
|
| 55 |
cmake_src_prepare |
| 56 |
sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die |
Archives