Accepting request 933308 from home:iznogood:branches:graphics

- Add ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch: Fix build
  with poppler 21.11.0, patch from upstream git.

OBS-URL: https://build.opensuse.org/request/show/933308
OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=81

ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch

@@ -0,0 +1,30 @@
+From ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd 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 *.
+(cherry picked from commit 5724c21b9cb7b6176a7b36ca24068b148c817e82)
+---
+ 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
+

inkscape.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 23 17:14:23 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch: Fix build
+  with poppler 21.11.0, patch from upstream git.
+
 -------------------------------------------------------------------
 Fri Sep 24 07:55:50 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
 

inkscape.spec

@@ -28,6 +28,9 @@ Source:         https://inkscape.org/gallery/item/29255/inkscape-%{_version}.tar
 # openSUSE palette file
 Source1:        openSUSE.gpl
 Source2:        inkscape-split-extensions-extra.py
+# PATCH-FIX-UPSTREAM ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch -- Fix build with poppler 21.11.0
+Patch0:         https://gitlab.com/inkscape/inkscape/-/commit/ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch
+
 BuildRequires:  cmake
 BuildRequires:  double-conversion-devel
 BuildRequires:  fdupes