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

[Evangelos Foutras]

    Date: Wednesday, March 2, 2022 @ 10:14:07
  Author: foutrelis
Revision: 438281

Fix build with poppler 22.03.0

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

-----------------------+
 PKGBUILD              |    8 ++++++--
 poppler-22.03.0.patch |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-02 10:03:25 UTC (rev 438280)
+++ PKGBUILD	2022-03-02 10:14:07 UTC (rev 438281)
@@ -43,8 +43,10 @@
 )
 
 #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-22.03.0.patch)
+sha256sums=('SKIP'
+            'cc4910d8db7ae40f280e144fd575fe921e781771e02776570371709e3d3ed42a')
 
 _backports=(
 )
@@ -59,6 +61,8 @@
 		git log --oneline -1 "${_c}"
 		git cherry-pick -n "${_c}"
 	done
+
+	patch -Np1 -i ../poppler-22.03.0.patch
 }
 
 build() {

Added: poppler-22.03.0.patch
===================================================================
--- poppler-22.03.0.patch	                        (rev 0)
+++ poppler-22.03.0.patch	2022-03-02 10:14:07 UTC (rev 438281)
@@ -0,0 +1,17 @@
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index e6204f650c..b2424e996e 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -668,8 +668,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+ 
+     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+     // glib gstdio.c
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++    pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri));   // TODO: Could ask for password
++#else
+     GooString *filename_goo = new GooString(uri);
+     pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
++#endif
+ 
+     if (!pdf_doc->isOk()) {
+         int error = pdf_doc->getErrorCode();