* update inkscape to 1.3.2-4

inkscape/PKGBUILD

@@ -5,8 +5,7 @@
 
 pkgname=inkscape
 pkgver=1.3.2
-_tag='091e20ef0f204eb40ecde54436e1ef934a03d894' # git rev-parse INKSCAPE_${pkgver/./_}
-pkgrel=3
+pkgrel=4
 pkgdesc='Professional vector graphics editor'
 url='https://inkscape.org/'
 license=('GPL' 'LGPL')
@@ -92,25 +91,25 @@ optdepends=(
   'texlive-pstricks: latex formulas'
 )
 
-options=(!debug)
-
 #source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2")
-source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}"
+source=("git+https://gitlab.com/inkscape/inkscape.git#tag=INKSCAPE_${pkgver//./_}"
         'inkscape-extensions::git+https://gitlab.com/inkscape/extensions.git'
         'inkscape-lib2geom::git+https://gitlab.com/inkscape/lib2geom.git'
         'inkscape-themes::git+https://gitlab.com/inkscape/themes.git'
         'inkscape-extras-extensions-gcodetools::git+https://gitlab.com/inkscape/extras/extensions-gcodetools.git'
         'inkscape-extras-extension-manager::git+https://gitlab.com/inkscape/extras/extension-manager.git'
         'inkscape-extras-inkscape-import-clipart::git+https://gitlab.com/inkscape/extras/inkscape-import-clipart.git'
-        'inkscape-extras-extension-xaml::git+https://gitlab.com/inkscape/extras/extension-xaml.git')
-sha256sums=('SKIP'
+        'inkscape-extras-extension-xaml::git+https://gitlab.com/inkscape/extras/extension-xaml.git'
+        inkscape-1.3.2-poppler-24.03.patch)
+sha256sums=('31d286dff9a3e295b7f89f806300ecc91c306e08a273f29501082fe33f1ebafe'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '499bc0bd0d8600b597220f463034d5e132e69c7833108d6b766445e70e9c82ed')
 
 _backports=(
   # include missing header file
@@ -136,6 +135,8 @@ prepare() {
   git log --oneline -1 "${_c}"
   git cherry-pick -n "${_c}"
   done
+
+  patch -Np1 -i ../inkscape-1.3.2-poppler-24.03.patch
 }
 
 build() {

inkscape/inkscape-1.3.2-poppler-24.03.patch

@@ -0,0 +1,61 @@
+From 3dd9846ab99260134e11938f0e575be822507037 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Mar 2024 22:59:40 +0100
+Subject: [PATCH] Fix build with >=poppler-24.03.0
+
+Fixes build errors caused by:
+
+"Use an enum for Function getType"
+Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/extension/internal/pdfinput/svg-builder.cpp | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 525fbfec0..bcd7b1f61 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1175,9 +1175,13 @@ static bool svgGetShadingColor(GfxShading *shading, double offset, GfxColor *res
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+                                    _POPPLER_CONST Function *func) {
+-    int type = func->getType();
++    auto type = func->getType();
+     auto space = shading->getColorSpace();
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++    if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) {  // Sampled or exponential function
++#else
+     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
++#endif
+         GfxColor stop1, stop2;
+         if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) {
+             return false;
+@@ -1185,7 +1189,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+             _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+             _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+         }
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++    } else if ( type == Function::Type::Stitching ) { // Stitching
++#else
+     } else if ( type == 3 ) { // Stitching
++#endif
+         auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
+         const double *bounds = stitchingFunc->getBounds();
+         const double *encode = stitchingFunc->getEncode();
+@@ -1200,7 +1208,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+         for ( int i = 0 ; i < num_funcs ; i++ ) {
+             svgGetShadingColor(shading, bounds[i + 1], &color);
+             // Add stops
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++            if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) {    // process exponential fxn
++#else
+             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
++#endif
+                 double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+                 if (expE > 1.0) {
+                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
+-- 
+2.44.0
+