[arch-commits] Commit in inkscape/trunk (PKGBUILD poppler-21.11.0.patch)

[Evangelos Foutras]

    Date: Monday, November 1, 2021 @ 19:52:17
  Author: foutrelis
Revision: 426951

Fix build with poppler 21.11.0

Added:
  inkscape/trunk/poppler-21.11.0.patch
Modified:
  inkscape/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 +++++++--
 poppler-21.11.0.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-01 19:50:35 UTC (rev 426950)
+++ PKGBUILD	2021-11-01 19:52:17 UTC (rev 426951)
@@ -43,13 +43,18 @@
 )
 
 #source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2")
-source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}")
-sha256sums=('SKIP')
+source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}"
+        poppler-21.11.0.patch)
+sha256sums=('SKIP'
+            '76bd1cc64ce7abef0f1758a7f05d9ca9e2cf44506318fb8ae9da029543aa1762')
 
 prepare() {
 	cd "${pkgname}"
 	git submodule init
 	git submodule update
+
+	# https://gitlab.com/inkscape/inkscape/-/merge_requests/3622
+	patch -Np1 -i ../poppler-21.11.0.patch
 }
 
 build() {

Added: poppler-21.11.0.patch
===================================================================
--- poppler-21.11.0.patch	                        (rev 0)
+++ poppler-21.11.0.patch	2021-11-01 19:52:17 UTC (rev 426951)
@@ -0,0 +1,26 @@
+From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at 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);