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

[Christian Hesse]

    Date: Thursday, May 5, 2022 @ 20:25:41
  Author: eworm
Revision: 444723

upgpkg: inkscape 1.1.2-3: poppler 22.05.0 rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-05 20:22:39 UTC (rev 444722)
+++ PKGBUILD	2022-05-05 20:25:41 UTC (rev 444723)
@@ -5,7 +5,7 @@
 pkgname=inkscape
 pkgver=1.1.2
 _tag='0a00cf5339ab09436cbe123d22e98fb791619733' # git rev-parse INKSCAPE_${pkgver/./_}
-pkgrel=2
+pkgrel=3
 pkgdesc='Professional vector graphics editor'
 url='https://inkscape.org/'
 license=('GPL' 'LGPL')
@@ -43,12 +43,15 @@
 )
 
 #source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2")
-source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}"
-        poppler-22.03.0.patch)
-sha256sums=('SKIP'
-            'cc4910d8db7ae40f280e144fd575fe921e781771e02776570371709e3d3ed42a')
+source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}")
+sha256sums=('SKIP')
 
 _backports=(
+  # Ensure compatibility with Poppler 22.03 and later
+  'a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75'
+
+  # Compatibility with Poppler 22.04
+  'd989cdf1059c78bc3bb6414330242073768d640b'
 )
 
 prepare() {
@@ -61,8 +64,6 @@
 		git log --oneline -1 "${_c}"
 		git cherry-pick -n "${_c}"
 	done
-
-	patch -Np1 -i ../poppler-22.03.0.patch
 }
 
 build() {

Deleted: poppler-22.03.0.patch
===================================================================
--- poppler-22.03.0.patch	2022-05-05 20:22:39 UTC (rev 444722)
+++ poppler-22.03.0.patch	2022-05-05 20:25:41 UTC (rev 444723)
@@ -1,17 +0,0 @@
-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();