aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2021-11-08 07:48:52 +0000
committerGleb Popov <arrowd@FreeBSD.org>2021-11-08 07:50:06 +0000
commit09b7766d410e3ba775c46c894022335a20b4f46a (patch)
tree41ac5882fd506f5ff609efbc5da8aab241e70c34
parent4fa290bfbb9187c2daeebf93d111eb0a0bb36dae (diff)
downloadports-09b7766d410e3ba775c46c894022335a20b4f46a.tar.gz
ports-09b7766d410e3ba775c46c894022335a20b4f46a.zip
graphics/inkscape: Fix build with upcoming Poppler 21.11.0
Reported by: tcberner Obtained from: Arch Linux PR: 259656
-rw-r--r--graphics/inkscape/files/patch-poppler-compat.diff26
1 files changed, 26 insertions, 0 deletions
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);