git: 09b7766d410e - main - graphics/inkscape: Fix build with upcoming Poppler 21.11.0

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Mon, 08 Nov 2021 07:50:47 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09b7766d410e3ba775c46c894022335a20b4f46a

commit 09b7766d410e3ba775c46c894022335a20b4f46a
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-11-08 07:48:52 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-11-08 07:50:06 +0000

    graphics/inkscape: Fix build with upcoming Poppler 21.11.0
    
    Reported by:    tcberner
    Obtained from:  Arch Linux
    
    PR:             259656
---
 graphics/inkscape/files/patch-poppler-compat.diff | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/graphics/inkscape/files/patch-poppler-compat.diff b/graphics/inkscape/files/patch-poppler-compat.diff
new file mode 100644
index 000000000000..c12ac5eccdd4
--- /dev/null
+++ b/graphics/inkscape/files/patch-poppler-compat.diff
@@ -0,0 +1,26 @@
+From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001
+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 *.
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index e3d04d544b..feecefa043 100644
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ 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);