commit 205fd5fdb50f4ebc4aae0bf58a95e0359c627e29 Author: Tim Biermann <tbier@posteo.de> Date: Fri Dec 9 21:43:11 2022 +0000 inkscape: 1.2.1 -> 1.2.2 diff --git a/inkscape/.footprint b/inkscape/.footprint index 55ea3e11a..eaf014a74 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -3,102 +3,102 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/inkscape -rwxr-xr-x root/root usr/bin/inkview drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/2geom-1.1.0/ -drwxr-xr-x root/root usr/include/2geom-1.1.0/2geom/ --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/2geom.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/affine.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/angle.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/basic-intersection.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/bezier-curve.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/bezier-to-sbasis.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/bezier-utils.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/bezier.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/cairo-path-sink.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/choose.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/circle.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/concepts.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/conic_section_clipper.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/conic_section_clipper_cr.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/conic_section_clipper_impl.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/conicsec.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/convex-hull.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/coord.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/crossing.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/curve.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/curves.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/d2.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/ellipse.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/elliptical-arc.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/exception.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/forward.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/generic-interval.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/generic-rect.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/geom.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/int-interval.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/int-point.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/int-rect.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/intersection-graph.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/intersection.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/interval.h -drwxr-xr-x root/root usr/include/2geom-1.1.0/2geom/intervaltree/ --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/intervaltree/interval_tree.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/line.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/linear.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/math-utils.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/nearest-time.h -drwxr-xr-x root/root usr/include/2geom-1.1.0/2geom/numeric/ --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/fitting-model.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/fitting-tool.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/linear_system.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/matrix.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/symmetric-matrix-fs-operation.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/symmetric-matrix-fs-trace.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/symmetric-matrix-fs.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/numeric/vector.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/ord.h -drwxr-xr-x root/root usr/include/2geom-1.1.0/2geom/orphan-code/ --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/arc-length.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/chebyshev.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/intersection-by-smashing.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/linear-of.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/linearN.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/redblacktree.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/rtree.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/sbasis-of.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/orphan-code/sbasisN.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/parallelogram.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/path-intersection.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/path-sink.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/path.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/pathvector.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/piecewise.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/point.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/polynomial.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/ray.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/rect.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis-2d.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis-curve.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis-geometric.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis-math.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis-poly.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis-to-bezier.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sbasis.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/solver.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/svg-path-parser.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/svg-path-writer.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sweep-bounds.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/sweeper.h -drwxr-xr-x root/root usr/include/2geom-1.1.0/2geom/symbolic/ --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/determinant-minor.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/implicit.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/matrix.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/multi-index.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/multipoly.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/mvpoly-tools.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/polynomial.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/symbolic/unity-builder.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/transforms.h --rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/utils.h +drwxr-xr-x root/root usr/include/2geom-1.2.2/ +drwxr-xr-x root/root usr/include/2geom-1.2.2/2geom/ +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/2geom.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/affine.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/angle.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/basic-intersection.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/bezier-curve.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/bezier-to-sbasis.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/bezier-utils.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/bezier.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/cairo-path-sink.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/choose.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/circle.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/concepts.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/conic_section_clipper.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/conic_section_clipper_cr.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/conic_section_clipper_impl.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/conicsec.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/convex-hull.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/coord.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/crossing.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/curve.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/curves.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/d2.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/ellipse.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/elliptical-arc.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/exception.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/forward.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/generic-interval.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/generic-rect.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/geom.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/int-interval.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/int-point.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/int-rect.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/intersection-graph.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/intersection.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/interval.h +drwxr-xr-x root/root usr/include/2geom-1.2.2/2geom/intervaltree/ +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/intervaltree/interval_tree.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/line.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/linear.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/math-utils.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/nearest-time.h +drwxr-xr-x root/root usr/include/2geom-1.2.2/2geom/numeric/ +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/fitting-model.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/fitting-tool.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/linear_system.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/matrix.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/symmetric-matrix-fs-operation.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/symmetric-matrix-fs-trace.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/symmetric-matrix-fs.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/numeric/vector.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/ord.h +drwxr-xr-x root/root usr/include/2geom-1.2.2/2geom/orphan-code/ +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/arc-length.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/chebyshev.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/intersection-by-smashing.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/linear-of.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/linearN.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/redblacktree.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/rtree.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/sbasis-of.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/orphan-code/sbasisN.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/parallelogram.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/path-intersection.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/path-sink.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/path.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/pathvector.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/piecewise.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/point.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/polynomial.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/ray.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/rect.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis-2d.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis-curve.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis-geometric.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis-math.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis-poly.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis-to-bezier.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sbasis.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/solver.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/svg-path-parser.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/svg-path-writer.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sweep-bounds.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/sweeper.h +drwxr-xr-x root/root usr/include/2geom-1.2.2/2geom/symbolic/ +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/determinant-minor.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/implicit.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/matrix.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/multi-index.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/multipoly.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/mvpoly-tools.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/polynomial.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/symbolic/unity-builder.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/transforms.h +-rw-r--r-- root/root usr/include/2geom-1.2.2/2geom/utils.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/2Geom/ @@ -108,9 +108,8 @@ drwxr-xr-x root/root usr/lib/cmake/2Geom/ -rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomTargets.cmake drwxr-xr-x root/root usr/lib/inkscape/ -rwxr-xr-x root/root usr/lib/inkscape/libinkscape_base.so --rwxr-xr-x root/root usr/lib/inkscape/libpoppler.so.124 -lrwxrwxrwx root/root usr/lib/lib2geom.so -> lib2geom.so.1.1.0 --rwxr-xr-x root/root usr/lib/lib2geom.so.1.1.0 +lrwxrwxrwx root/root usr/lib/lib2geom.so -> lib2geom.so.1.2.0 +-rwxr-xr-x root/root usr/lib/lib2geom.so.1.2.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/2geom.pc drwxr-xr-x root/root usr/share/ diff --git a/inkscape/.signature b/inkscape/.signature index 0758bf813..addb5449f 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38PaOV7SSt23Xz8BarFh3+aESLPNXI6APT1BH9b47Gfd5MNSay0f7S1SiUf/UpUPte5L9ZANd4UD3SM1szlkVg8= -SHA256 (Pkgfile) = 934003e1692d951024ae8c6bdc238585a13eafdc8847e6943aa57a563f7618c3 -SHA256 (.footprint) = 50d4df1c4e5c01b01a53d984f35aad272b72f63502122f5926ccfc538d125258 -SHA256 (inkscape-1.2.1.tar.xz) = 46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b +RWSagIOpLGJF33f0OYINIzDITNsJR3k16HBr63PQQWhT7sSQzDeHdsunRRugfTYpwsgKBei1rWTgtHNJG1EO4V/OYQMQRqxIKA4= +SHA256 (Pkgfile) = 49b5e132de843c6b589789e6b55776cd425cb754c28063ec313bb53df58d3cbb +SHA256 (.footprint) = dc290d674156d86ea071f4d9b338dfd5f577f3bcbca08ad6b6c008ac087062f0 +SHA256 (inkscape-1.2.2.tar.xz) = a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4 SHA256 (poppler-22.09.0.tar.xz) = d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e -SHA256 (inkscape-1.2.1-poppler-22.09.0.patch) = 5e847d11c1c42db717ad39bc03708e3b855f0e0a99ee4ac8d97f5bfe4af8985c diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index c34294366..a8764ab84 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -5,14 +5,13 @@ name=inkscape _name=inkscape-INKSCAPE -version=1.2.1 +version=1.2.2 _version=1.2_2022-05-15_dc2aedaf03 _pversion=22.09.0 _psoversion=124 release=2 -source=(https://inkscape.org/gallery/item/34673/inkscape-1.2.1.tar.xz - https://poppler.freedesktop.org/poppler-$_pversion.tar.xz - inkscape-1.2.1-poppler-22.09.0.patch) +source=(https://inkscape.org/gallery/item/37360/inkscape-1.2.2.tar.xz + https://poppler.freedesktop.org/poppler-$_pversion.tar.xz) poppler() { cmake -S poppler-$_pversion -B build-poppler -G Ninja \ @@ -42,17 +41,14 @@ poppler() { build() { #[ ! -e "/usr/lib/inkscape/libpoppler.so.$_psoversion" ] && - poppler - - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4719 - patch -d inkscape-1.2.1_2022-07-14_9c6d41e410 -p1 -i $SRC/inkscape-1.2.1-poppler-22.09.0.patch + #poppler # https://gitlab.gnome.org/GNOME/glib/-/issues/2331 CFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape' CXXFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape' export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape" - cmake -S inkscape-1.2.1_2022-07-14_9c6d41e410 -B build -G Ninja \ + cmake -S inkscape-1.2.2_2022-12-01_b0a8486541 -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ diff --git a/inkscape/inkscape-1.2.1-poppler-22.09.0.patch b/inkscape/inkscape-1.2.1-poppler-22.09.0.patch deleted file mode 100644 index 168845814..000000000 --- a/inkscape/inkscape-1.2.1-poppler-22.09.0.patch +++ /dev/null @@ -1,83 +0,0 @@ -From fb00794923d19cfbb2ca4adca3ae8971553a06be Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 2 Sep 2022 06:21:28 +0100 -Subject: [PATCH] Fix build with Poppler 22.09.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With Poppler 22.09.0, inkscape fails to build with: -``` -/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’ - 394 | state->getLineDash(&dash_pattern, &dash_length, &dash_start); - | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44: -/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’ - 1506 | const std::vector<double> &getLineDash(double *start) - | ^~~~~~~~~~~ -[...] -/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’ - 700 | state->setLineDash(dash, length, args[1].getNum()); - | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -``` - -Poppler changed the getLineDash interface: -``` -- void getLineDash(double **dash, int *length, double *start) -+ const std::vector<double> &getLineDash(double *start) -``` - -... and the setLineDash interface: -```` -- void setLineDash(double *dash, int length, double start); -+ void setLineDash(std::vector<double> &&dash, double start); -``` - -Signed-off-by: Sam James <sam@gentoo.org> ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ - src/extension/internal/pdfinput/svg-builder.cpp | 9 ++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index cca1e84096..80d64c9b86 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) - _POPPLER_FREE(obj); - } - } -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum()); -+#else - state->setLineDash(dash, length, args[1].getNum()); -+#endif - builder->updateStyle(state); - } - -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index 12f71dd921..9fc56fe63c 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) { - sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str()); - - // Line dash -- double *dash_pattern; - int dash_length; - double dash_start; -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ const double *dash_pattern; -+ const std::vector<double> &dash = state->getLineDash(&dash_start); -+ dash_pattern = dash.data(); -+ dash_length = dash.size(); -+#else -+ double *dash_pattern; - state->getLineDash(&dash_pattern, &dash_length, &dash_start); -+#endif - if ( dash_length > 0 ) { - Inkscape::CSSOStringStream os_array; - for ( int i = 0 ; i < dash_length ; i++ ) { --- -GitLab -