CVS commit: pkgsrc/graphics/inkscape

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Feb  2 15:26:55 UTC 2023

Modified Files:
        pkgsrc/graphics/inkscape: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/inkscape/patches:
            patch-src_object_algorithms_graphlayout.cpp
Removed Files:
        pkgsrc/graphics/inkscape/patches:
            patch-src_extension_internal_pdfinput_pdf-parser.cpp
            patch-src_extension_internal_pdfinput_svg-builder.cpp

Log Message:
inkscape: update to 1.2.2

Maintenance and bugfix release, which brings 4 crash fixes, over 25 bug
fixes, 5 fixes for extension bugs and 13 improved UI translations.


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/inkscape/PLIST
cvs rdiff -u -r1.92 -r1.93 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r1.19 -r0 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
cvs rdiff -u -r1.8 -r0 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/inkscape/patches/patch-src_object_algorithms_graphlayout.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.260 pkgsrc/graphics/inkscape/Makefile:1.261
--- pkgsrc/graphics/inkscape/Makefile:1.260     Mon Jan 30 17:21:34 2023
+++ pkgsrc/graphics/inkscape/Makefile   Thu Feb  2 15:26:55 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.260 2023/01/30 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.261 2023/02/02 15:26:55 tnn Exp $
 
-DISTNAME=      inkscape-1.2.1
-PKGREVISION=   6
+DISTNAME=      inkscape-1.2.2
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.xz
@@ -21,7 +20,7 @@ DEPENDS+=             ${PYPKGPREFIX}-lxml-[0-9]*:..
 DEPENDS+=              ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
 DEPENDS+=              ${PYPKGPREFIX}-scour-[0-9]*:../../graphics/py-scour
 
-WRKSRC=                ${WRKDIR}/inkscape-1.2.1_2022-07-14_9c6d41e410
+WRKSRC=                ${WRKDIR}/inkscape-1.2.2_2022-12-01_b0a8486541
 
 # std::optional
 GCC_REQD+=             7
@@ -73,6 +72,7 @@ MANCOMPRESSED=        yes
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 CMAKE_ARGS+=   -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
+BUILDLINK_TRANSFORM+=  rm:-lX11 rm:-lXext
 .endif
 
 # There exists some race condition in create_default_templates.py that

Index: pkgsrc/graphics/inkscape/PLIST
diff -u pkgsrc/graphics/inkscape/PLIST:1.35 pkgsrc/graphics/inkscape/PLIST:1.36
--- pkgsrc/graphics/inkscape/PLIST:1.35 Mon Jul 25 19:42:33 2022
+++ pkgsrc/graphics/inkscape/PLIST      Thu Feb  2 15:26:55 2023
@@ -1,103 +1,103 @@
-@comment $NetBSD: PLIST,v 1.35 2022/07/25 19:42:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2023/02/02 15:26:55 tnn Exp $
 bin/inkscape
 bin/inkview
-include/2geom-1.1.0/2geom/2geom.h
-include/2geom-1.1.0/2geom/affine.h
-include/2geom-1.1.0/2geom/angle.h
-include/2geom-1.1.0/2geom/basic-intersection.h
-include/2geom-1.1.0/2geom/bezier-curve.h
-include/2geom-1.1.0/2geom/bezier-to-sbasis.h
-include/2geom-1.1.0/2geom/bezier-utils.h
-include/2geom-1.1.0/2geom/bezier.h
-include/2geom-1.1.0/2geom/cairo-path-sink.h
-include/2geom-1.1.0/2geom/choose.h
-include/2geom-1.1.0/2geom/circle.h
-include/2geom-1.1.0/2geom/concepts.h
-include/2geom-1.1.0/2geom/conic_section_clipper.h
-include/2geom-1.1.0/2geom/conic_section_clipper_cr.h
-include/2geom-1.1.0/2geom/conic_section_clipper_impl.h
-include/2geom-1.1.0/2geom/conicsec.h
-include/2geom-1.1.0/2geom/convex-hull.h
-include/2geom-1.1.0/2geom/coord.h
-include/2geom-1.1.0/2geom/crossing.h
-include/2geom-1.1.0/2geom/curve.h
-include/2geom-1.1.0/2geom/curves.h
-include/2geom-1.1.0/2geom/d2.h
-include/2geom-1.1.0/2geom/ellipse.h
-include/2geom-1.1.0/2geom/elliptical-arc.h
-include/2geom-1.1.0/2geom/exception.h
-include/2geom-1.1.0/2geom/forward.h
-include/2geom-1.1.0/2geom/generic-interval.h
-include/2geom-1.1.0/2geom/generic-rect.h
-include/2geom-1.1.0/2geom/geom.h
-include/2geom-1.1.0/2geom/int-interval.h
-include/2geom-1.1.0/2geom/int-point.h
-include/2geom-1.1.0/2geom/int-rect.h
-include/2geom-1.1.0/2geom/intersection-graph.h
-include/2geom-1.1.0/2geom/intersection.h
-include/2geom-1.1.0/2geom/interval.h
-include/2geom-1.1.0/2geom/intervaltree/interval_tree.h
-include/2geom-1.1.0/2geom/line.h
-include/2geom-1.1.0/2geom/linear.h
-include/2geom-1.1.0/2geom/math-utils.h
-include/2geom-1.1.0/2geom/nearest-time.h
-include/2geom-1.1.0/2geom/numeric/fitting-model.h
-include/2geom-1.1.0/2geom/numeric/fitting-tool.h
-include/2geom-1.1.0/2geom/numeric/linear_system.h
-include/2geom-1.1.0/2geom/numeric/matrix.h
-include/2geom-1.1.0/2geom/numeric/symmetric-matrix-fs-operation.h
-include/2geom-1.1.0/2geom/numeric/symmetric-matrix-fs-trace.h
-include/2geom-1.1.0/2geom/numeric/symmetric-matrix-fs.h
-include/2geom-1.1.0/2geom/numeric/vector.h
-include/2geom-1.1.0/2geom/ord.h
-include/2geom-1.1.0/2geom/orphan-code/arc-length.h
-include/2geom-1.1.0/2geom/orphan-code/chebyshev.h
-include/2geom-1.1.0/2geom/orphan-code/intersection-by-smashing.h
-include/2geom-1.1.0/2geom/orphan-code/linear-of.h
-include/2geom-1.1.0/2geom/orphan-code/linearN.h
-include/2geom-1.1.0/2geom/orphan-code/redblacktree.h
-include/2geom-1.1.0/2geom/orphan-code/rtree.h
-include/2geom-1.1.0/2geom/orphan-code/sbasis-of.h
-include/2geom-1.1.0/2geom/orphan-code/sbasisN.h
-include/2geom-1.1.0/2geom/parallelogram.h
-include/2geom-1.1.0/2geom/path-intersection.h
-include/2geom-1.1.0/2geom/path-sink.h
-include/2geom-1.1.0/2geom/path.h
-include/2geom-1.1.0/2geom/pathvector.h
-include/2geom-1.1.0/2geom/piecewise.h
-include/2geom-1.1.0/2geom/point.h
-include/2geom-1.1.0/2geom/polynomial.h
-include/2geom-1.1.0/2geom/ray.h
-include/2geom-1.1.0/2geom/rect.h
-include/2geom-1.1.0/2geom/sbasis-2d.h
-include/2geom-1.1.0/2geom/sbasis-curve.h
-include/2geom-1.1.0/2geom/sbasis-geometric.h
-include/2geom-1.1.0/2geom/sbasis-math.h
-include/2geom-1.1.0/2geom/sbasis-poly.h
-include/2geom-1.1.0/2geom/sbasis-to-bezier.h
-include/2geom-1.1.0/2geom/sbasis.h
-include/2geom-1.1.0/2geom/solver.h
-include/2geom-1.1.0/2geom/svg-path-parser.h
-include/2geom-1.1.0/2geom/svg-path-writer.h
-include/2geom-1.1.0/2geom/sweep-bounds.h
-include/2geom-1.1.0/2geom/sweeper.h
-include/2geom-1.1.0/2geom/symbolic/determinant-minor.h
-include/2geom-1.1.0/2geom/symbolic/implicit.h
-include/2geom-1.1.0/2geom/symbolic/matrix.h
-include/2geom-1.1.0/2geom/symbolic/multi-index.h
-include/2geom-1.1.0/2geom/symbolic/multipoly.h
-include/2geom-1.1.0/2geom/symbolic/mvpoly-tools.h
-include/2geom-1.1.0/2geom/symbolic/polynomial.h
-include/2geom-1.1.0/2geom/symbolic/unity-builder.h
-include/2geom-1.1.0/2geom/transforms.h
-include/2geom-1.1.0/2geom/utils.h
+include/2geom-${PKGVERSION}/2geom/2geom.h
+include/2geom-${PKGVERSION}/2geom/affine.h
+include/2geom-${PKGVERSION}/2geom/angle.h
+include/2geom-${PKGVERSION}/2geom/basic-intersection.h
+include/2geom-${PKGVERSION}/2geom/bezier-curve.h
+include/2geom-${PKGVERSION}/2geom/bezier-to-sbasis.h
+include/2geom-${PKGVERSION}/2geom/bezier-utils.h
+include/2geom-${PKGVERSION}/2geom/bezier.h
+include/2geom-${PKGVERSION}/2geom/cairo-path-sink.h
+include/2geom-${PKGVERSION}/2geom/choose.h
+include/2geom-${PKGVERSION}/2geom/circle.h
+include/2geom-${PKGVERSION}/2geom/concepts.h
+include/2geom-${PKGVERSION}/2geom/conic_section_clipper.h
+include/2geom-${PKGVERSION}/2geom/conic_section_clipper_cr.h
+include/2geom-${PKGVERSION}/2geom/conic_section_clipper_impl.h
+include/2geom-${PKGVERSION}/2geom/conicsec.h
+include/2geom-${PKGVERSION}/2geom/convex-hull.h
+include/2geom-${PKGVERSION}/2geom/coord.h
+include/2geom-${PKGVERSION}/2geom/crossing.h
+include/2geom-${PKGVERSION}/2geom/curve.h
+include/2geom-${PKGVERSION}/2geom/curves.h
+include/2geom-${PKGVERSION}/2geom/d2.h
+include/2geom-${PKGVERSION}/2geom/ellipse.h
+include/2geom-${PKGVERSION}/2geom/elliptical-arc.h
+include/2geom-${PKGVERSION}/2geom/exception.h
+include/2geom-${PKGVERSION}/2geom/forward.h
+include/2geom-${PKGVERSION}/2geom/generic-interval.h
+include/2geom-${PKGVERSION}/2geom/generic-rect.h
+include/2geom-${PKGVERSION}/2geom/geom.h
+include/2geom-${PKGVERSION}/2geom/int-interval.h
+include/2geom-${PKGVERSION}/2geom/int-point.h
+include/2geom-${PKGVERSION}/2geom/int-rect.h
+include/2geom-${PKGVERSION}/2geom/intersection-graph.h
+include/2geom-${PKGVERSION}/2geom/intersection.h
+include/2geom-${PKGVERSION}/2geom/interval.h
+include/2geom-${PKGVERSION}/2geom/intervaltree/interval_tree.h
+include/2geom-${PKGVERSION}/2geom/line.h
+include/2geom-${PKGVERSION}/2geom/linear.h
+include/2geom-${PKGVERSION}/2geom/math-utils.h
+include/2geom-${PKGVERSION}/2geom/nearest-time.h
+include/2geom-${PKGVERSION}/2geom/numeric/fitting-model.h
+include/2geom-${PKGVERSION}/2geom/numeric/fitting-tool.h
+include/2geom-${PKGVERSION}/2geom/numeric/linear_system.h
+include/2geom-${PKGVERSION}/2geom/numeric/matrix.h
+include/2geom-${PKGVERSION}/2geom/numeric/symmetric-matrix-fs-operation.h
+include/2geom-${PKGVERSION}/2geom/numeric/symmetric-matrix-fs-trace.h
+include/2geom-${PKGVERSION}/2geom/numeric/symmetric-matrix-fs.h
+include/2geom-${PKGVERSION}/2geom/numeric/vector.h
+include/2geom-${PKGVERSION}/2geom/ord.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/arc-length.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/chebyshev.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/intersection-by-smashing.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/linear-of.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/linearN.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/redblacktree.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/rtree.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/sbasis-of.h
+include/2geom-${PKGVERSION}/2geom/orphan-code/sbasisN.h
+include/2geom-${PKGVERSION}/2geom/parallelogram.h
+include/2geom-${PKGVERSION}/2geom/path-intersection.h
+include/2geom-${PKGVERSION}/2geom/path-sink.h
+include/2geom-${PKGVERSION}/2geom/path.h
+include/2geom-${PKGVERSION}/2geom/pathvector.h
+include/2geom-${PKGVERSION}/2geom/piecewise.h
+include/2geom-${PKGVERSION}/2geom/point.h
+include/2geom-${PKGVERSION}/2geom/polynomial.h
+include/2geom-${PKGVERSION}/2geom/ray.h
+include/2geom-${PKGVERSION}/2geom/rect.h
+include/2geom-${PKGVERSION}/2geom/sbasis-2d.h
+include/2geom-${PKGVERSION}/2geom/sbasis-curve.h
+include/2geom-${PKGVERSION}/2geom/sbasis-geometric.h
+include/2geom-${PKGVERSION}/2geom/sbasis-math.h
+include/2geom-${PKGVERSION}/2geom/sbasis-poly.h
+include/2geom-${PKGVERSION}/2geom/sbasis-to-bezier.h
+include/2geom-${PKGVERSION}/2geom/sbasis.h
+include/2geom-${PKGVERSION}/2geom/solver.h
+include/2geom-${PKGVERSION}/2geom/svg-path-parser.h
+include/2geom-${PKGVERSION}/2geom/svg-path-writer.h
+include/2geom-${PKGVERSION}/2geom/sweep-bounds.h
+include/2geom-${PKGVERSION}/2geom/sweeper.h
+include/2geom-${PKGVERSION}/2geom/symbolic/determinant-minor.h
+include/2geom-${PKGVERSION}/2geom/symbolic/implicit.h
+include/2geom-${PKGVERSION}/2geom/symbolic/matrix.h
+include/2geom-${PKGVERSION}/2geom/symbolic/multi-index.h
+include/2geom-${PKGVERSION}/2geom/symbolic/multipoly.h
+include/2geom-${PKGVERSION}/2geom/symbolic/mvpoly-tools.h
+include/2geom-${PKGVERSION}/2geom/symbolic/polynomial.h
+include/2geom-${PKGVERSION}/2geom/symbolic/unity-builder.h
+include/2geom-${PKGVERSION}/2geom/transforms.h
+include/2geom-${PKGVERSION}/2geom/utils.h
 lib/cmake/2Geom/2GeomConfig.cmake
 lib/cmake/2Geom/2GeomConfigVersion.cmake
 lib/cmake/2Geom/2GeomTargets-release.cmake
 lib/cmake/2Geom/2GeomTargets.cmake
 lib/inkscape/libinkscape_base.so
 lib/lib2geom.so
-lib/lib2geom.so.1.1.0
+lib/lib2geom.so.1.2.0
 lib/pkgconfig/2geom.pc
 man/de/man1/inkscape.1
 man/de/man1/inkview.1

Index: pkgsrc/graphics/inkscape/distinfo
diff -u pkgsrc/graphics/inkscape/distinfo:1.92 pkgsrc/graphics/inkscape/distinfo:1.93
--- pkgsrc/graphics/inkscape/distinfo:1.92      Sun Sep  4 07:55:02 2022
+++ pkgsrc/graphics/inkscape/distinfo   Thu Feb  2 15:26:55 2023
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.92 2022/09/04 07:55:02 martin Exp $
+$NetBSD: distinfo,v 1.93 2023/02/02 15:26:55 tnn Exp $
 
-BLAKE2s (inkscape-1.2.1.tar.xz) = d044b582e20c274f04fb1f3fd8392d0e42798aa7aed284ad81d263cfa4d3926a
-SHA512 (inkscape-1.2.1.tar.xz) = 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
-Size (inkscape-1.2.1.tar.xz) = 98048464 bytes
+BLAKE2s (inkscape-1.2.2.tar.xz) = cabd3b9f4fe5d8aabfc47053f4a6197a82d55e83710c666ef88f31c7b6fc7145
+SHA512 (inkscape-1.2.2.tar.xz) = b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
+Size (inkscape-1.2.2.tar.xz) = 39392040 bytes
 SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = 26351c300629e28f6523fe2167a2eed5802435cf
 SHA1 (patch-src_actions_actions-edit.cpp) = 8f18d7889ba2d1d8e39b9ee6c87e0d3df905807d
 SHA1 (patch-src_extension_implementation_script.cpp) = da46549f688da5c9c0ecbeaeac7962e4f261cae4
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 45d82e49593cad9de30fc34c78ddc5836b494136
-SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = 083636dee58dc862fe26a1e81c380d4c508f2382
+SHA1 (patch-src_object_algorithms_graphlayout.cpp) = db2aa4d4a8ecece0b62ca335d03308c56a7d1591

Added files:

Index: pkgsrc/graphics/inkscape/patches/patch-src_object_algorithms_graphlayout.cpp
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_object_algorithms_graphlayout.cpp:1.1
--- /dev/null   Thu Feb  2 15:26:55 2023
+++ pkgsrc/graphics/inkscape/patches/patch-src_object_algorithms_graphlayout.cpp        Thu Feb  2 15:26:55 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_object_algorithms_graphlayout.cpp,v 1.1 2023/02/02 15:26:55 tnn Exp $
+
+graphlayout.cpp:150:32: error: implicit instantiation of undefined template 'std::array<SPItem *, 2>'
+        std::array<SPItem*, 2> attachedItems;
+
+--- src/object/algorithms/graphlayout.cpp.orig 2022-11-26 17:42:01.000000000 +0000
++++ src/object/algorithms/graphlayout.cpp
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <algorithm>
++#include <array>
+ #include <cstring>
+ #include <iostream>
+ #include <list>