[pkgsrc/trunk]: pkgsrc/graphics/inkscape inkscape: fix build with poppler-21....

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb7feb77344f
branches:  trunk
changeset: 769098:cb7feb77344f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Nov 07 21:28:48 2021 +0000

description:
inkscape: fix build with poppler-21.11.0

diffstat:

 graphics/inkscape/distinfo                                                     |   3 +-
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp |  19 ++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 2f54ff50351d -r cb7feb77344f graphics/inkscape/distinfo
--- a/graphics/inkscape/distinfo        Sun Nov 07 20:59:27 2021 +0000
+++ b/graphics/inkscape/distinfo        Sun Nov 07 21:28:48 2021 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.85 2021/10/26 10:46:20 nia Exp $
+$NetBSD: distinfo,v 1.86 2021/11/07 21:28:48 wiz Exp $
 
 BLAKE2s (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = a3cd5ffae74aefb0f553393204a36f76eae6d36c4fec8c68040f2c0a903d1904
 SHA512 (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 Size (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = 34221284 bytes
 SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = 26351c300629e28f6523fe2167a2eed5802435cf
 SHA1 (patch-src_extension_implementation_script.cpp) = da46549f688da5c9c0ecbeaeac7962e4f261cae4
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = e65c9c731927cec6ae595b7f2abbb94791dfde59
diff -r 2f54ff50351d -r cb7feb77344f graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp    Sun Nov 07 21:28:48 2021 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.15 2021/11/07 21:28:48 wiz Exp $
+
+Fix build with poppler-21.11.0
+https://gitlab.com/inkscape/inkscape/-/merge_requests/3622/diffs?commit_id=d7fb99ff5708d4fe3cf3526966b73d81da71a7b2
+
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2021-05-25 11:35:00.000000000 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[],
+   }
+   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);