From 1ff2c52066e761114b03da6c098d959784a59f1f Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Fri, 14 Jan 2022 09:15:25 -0600
Subject: [PATCH] Poppler patch.

---
 ...c21b9cb7b6176a7b36ca24068b148c817e82.patch | 29 +++++++++++++++++++
 inkscape.spec                                 |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 5724c21b9cb7b6176a7b36ca24068b148c817e82.patch

diff --git a/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch b/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch
new file mode 100644
index 0000000..5d7f480
--- /dev/null
+++ b/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch
@@ -0,0 +1,29 @@
+From 5724c21b9cb7b6176a7b36ca24068b148c817e82 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
+--- 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/inkscape.spec b/inkscape.spec
index fcb0ce5..d82a0dd 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -16,6 +16,7 @@ Source0:        https://inkscape.org/gallery/item/29255/inkscape-1.1.1.tar.xz
 Source2:	Fedora-Color-Palette.gpl
 
 Patch0: b3dabef2245d4e4e977ee9d6776be9a134493515.patch
+Patch1: 5724c21b9cb7b6176a7b36ca24068b148c817e82.patch
 
 Provides: bundled(libcroco)
 Provides: bundled(autotrace)
@@ -215,7 +216,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
 
 %changelog
 * Thu Jan 13 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.1.1-3
-- Poppler rebuild.
+- Poppler rebuild, with upstream patch.
 
 * Wed Nov 10 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1.1-2
 - Patch for Pango multiline issue.