From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
Date: Sat, 6 Nov 2021 21:06:42 +0000 (UTC) [thread overview]
Message-ID: <1636232794.22cd821e55975b479094132da6a319e1fb15f3cd.sam@gentoo> (raw)
commit: 22cd821e55975b479094132da6a319e1fb15f3cd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 21:06:08 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 21:06:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cd821e
media-gfx/inkscape: fix build with Poppler 21.11.0
Closes: https://bugs.gentoo.org/822129
Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/inkscape-1.1-poppler-21.11.0.patch | 20 ++++++++++++++++++++
media-gfx/inkscape/inkscape-1.1.ebuild | 1 +
2 files changed, 21 insertions(+)
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 00000000000..7b02253d5f9
--- /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 e62f8efdec2..0a00c0afef4 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
next reply other threads:[~2021-11-06 21:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-06 21:06 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-03 16:15 [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/ Andreas Sturmlechner
2025-07-08 16:03 Andreas Sturmlechner
2025-02-15 0:12 Andreas K. Hüttel
2024-12-17 21:44 Andreas Sturmlechner
2024-11-14 18:42 Andreas Sturmlechner
2024-10-17 7:08 Sam James
2024-04-05 15:02 Andreas Sturmlechner
2024-03-04 22:18 Andreas Sturmlechner
2024-01-29 9:37 Sam James
2022-10-22 14:54 Michał Górny
2022-09-03 4:25 Sam James
2022-09-03 1:43 Sam James
2022-05-26 2:47 Sam James
2022-05-08 17:42 Sam James
2021-12-17 14:55 Andreas Sturmlechner
2021-04-14 19:28 Mikle Kolyada
2020-04-25 13:24 Andreas K. Hüttel
2020-01-06 10:31 Andreas K. Hüttel
2019-12-11 9:20 Miroslav Šulc
2019-11-07 8:11 Lars Wendler
2019-01-11 0:37 Andreas Sturmlechner
2018-11-07 15:48 Lars Wendler
2018-05-25 9:35 Lars Wendler
2018-03-31 5:12 Tim Harder
2017-05-12 19:41 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1636232794.22cd821e55975b479094132da6a319e1fb15f3cd.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox