CVS commit: pkgsrc/graphics/inkscape

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Mar 11 21:19:39 UTC 2024

Modified Files:
        pkgsrc/graphics/inkscape: Makefile distinfo
Added Files:
        pkgsrc/graphics/inkscape/patches:
            patch-src_extension_internal_pdfinput_poppler-transition-api.h
            patch-src_extension_internal_pdfinput_svg-builder.cpp

Log Message:
inkscape: fix build with poppler-24.03.0.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h
cvs rdiff -u -r0 -r1.10 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.283 pkgsrc/graphics/inkscape/Makefile:1.284
--- pkgsrc/graphics/inkscape/Makefile:1.283     Sat Jan 27 18:35:28 2024
+++ pkgsrc/graphics/inkscape/Makefile   Mon Mar 11 21:19:38 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.283 2024/01/27 18:35:28 wiz Exp $
+# $NetBSD: Makefile,v 1.284 2024/03/11 21:19:38 wiz Exp $
 
 DISTNAME=      inkscape-1.3.2
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/inkscape/distinfo
diff -u pkgsrc/graphics/inkscape/distinfo:1.99 pkgsrc/graphics/inkscape/distinfo:1.100
--- pkgsrc/graphics/inkscape/distinfo:1.99      Sat Jan 27 18:35:28 2024
+++ pkgsrc/graphics/inkscape/distinfo   Mon Mar 11 21:19:38 2024
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.99 2024/01/27 18:35:28 wiz Exp $
+$NetBSD: distinfo,v 1.100 2024/03/11 21:19:38 wiz Exp $
 
 BLAKE2s (inkscape-1.3.2.tar.xz) = f4de59880a918e71faa4d88f6dad7205e378a13ff1d04c6a6aa6469c2aa0fefb
 SHA512 (inkscape-1.3.2.tar.xz) = a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
 Size (inkscape-1.3.2.tar.xz) = 44720944 bytes
 SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = 6638a97615ca37bcdc20463b37cd859d723f66d6
 SHA1 (patch-src_extension_implementation_script.cpp) = da46549f688da5c9c0ecbeaeac7962e4f261cae4
+SHA1 (patch-src_extension_internal_pdfinput_poppler-transition-api.h) = f95220c8239a72906f6a19de22ad2251e487b48a
+SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = ff1d441ccec9e04130ff5070bf61f5e529235e25
 SHA1 (patch-src_helper_mathfns.h) = 37977a9c767dd409088e552135c512ff76f675a4
 SHA1 (patch-src_object_uri.h) = 84ac2f168591d9d074d14aa1d7991a7bf47ad376

Added files:

Index: pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h:1.5
--- /dev/null   Mon Mar 11 21:19:39 2024
+++ pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h     Mon Mar 11 21:19:38 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_extension_internal_pdfinput_poppler-transition-api.h,v 1.5 2024/03/11 21:19:38 wiz Exp $
+
+Fix build with poppler-24.03.0.
+https://gitlab.com/a17r/inkscape/-/commit/394c0d2a14816c1de6d34b4d505a6b5f612edc1a
+
+--- src/extension/internal/pdfinput/poppler-transition-api.h.orig      2022-04-05 19:25:39.000000000 +0000
++++ src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,16 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++#define _POPPLER_TYPE_SAMPLED Function::Type::Sampled
++#define _POPPLER_TYPE_EXPONENTIAL Function::Type::Exponential
++#define _POPPLER_TYPE_STITCHING Function::Type::Stitching
++#else
++#define _POPPLER_TYPE_SAMPLED 0
++#define _POPPLER_TYPE_EXPONENTIAL 2
++#define _POPPLER_TYPE_STITCHING 3
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 4, 0)
+ #define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
+ #else

Index: pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp:1.10
--- /dev/null   Mon Mar 11 21:19:39 2024
+++ pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp      Mon Mar 11 21:19:39 2024
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_extension_internal_pdfinput_svg-builder.cpp,v 1.10 2024/03/11 21:19:39 wiz Exp $
+
+Fix build with poppler-24.03.0.
+https://gitlab.com/a17r/inkscape/-/commit/394c0d2a14816c1de6d34b4d505a6b5f612edc1a
+
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig       2023-11-16 19:05:21.000000000 +0000
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1158,9 +1158,9 @@ static bool svgGetShadingColor(GfxShadin
+ #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 ( type == 0 || type == 2 ) {  // Sampled or exponential function
++    if (type == _POPPLER_TYPE_SAMPLED || type == _POPPLER_TYPE_EXPONENTIAL) {
+         GfxColor stop1, stop2;
+         if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) {
+             return false;
+@@ -1168,7 +1168,7 @@ bool SvgBuilder::_addGradientStops(Inksc
+             _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+             _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+         }
+-    } else if ( type == 3 ) { // Stitching
++    } else if (type == _POPPLER_TYPE_STITCHING) {
+         auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
+         const double *bounds = stitchingFunc->getBounds();
+         const double *encode = stitchingFunc->getEncode();
+@@ -1183,7 +1183,7 @@ bool SvgBuilder::_addGradientStops(Inksc
+         for ( int i = 0 ; i < num_funcs ; i++ ) {
+             svgGetShadingColor(shading, bounds[i + 1], &color);
+             // Add stops
+-            if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
++            if (stitchingFunc->getFunc(i)->getType() == _POPPLER_TYPE_EXPONENTIAL) {
+                 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