pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/inkscape inkscape: update to 1.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e12d3919a60
branches:  trunk
changeset: 455274:3e12d3919a60
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jul 02 06:59:15 2021 +0000

description:
inkscape: update to 1.1.

Much help provided by Nathan Lee in fixing a startup issue.

Inkscape 1.1 is the latest major Inkscape release that brings users
many fresh new features and new functionality.

The most notable changes include:

    A Welcome dialog, where the look of Inkscape can be selected,
    and some choices for the new document's size or file to open
    are available

    A Command palette that opens when the ? key is pressed and that
    allows to search and use many functions without having to use
    a keyboard shortcut or going through the menus

    It is now possible to copy, cut and paste parts of paths with
    the Node tool

    The dialog docking system has been rewritten, which resolves
    many issues with Inkscape's docked dialogs and allows you to
    dock dialogs on either side of the screen

    New Outline Overlay mode that displays object outlines while
    also showing their real colors

    Preferences options are now easier to find by using the new
    search field

    It is no longer necessary to remember to click on 'Export' in
    the PNG Export dialog, as the exporting will already happen
    after the click on 'Save' in the file selection dialog.

    Export as JPG, TIFF, optimized PNG and WebP directly from
    Inkscape

    When pasting a copied object, Inkscape now pastes it directly
    on top of the currently selected object by default

    An extension for updating extensions and installing additional
    extensions, called the Extension Manager (currently in beta
    stage)

diffstat:

 graphics/inkscape/Makefile                                              |   36 +-
 graphics/inkscape/PLIST                                                 |  704 +++++++++-
 graphics/inkscape/distinfo                                              |   17 +-
 graphics/inkscape/options.mk                                            |   14 -
 graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake              |   31 -
 graphics/inkscape/patches/patch-src_3rdparty_autotrace_autotrace.h      |   21 -
 graphics/inkscape/patches/patch-src_display_cairo-utils.cpp             |   15 +
 graphics/inkscape/patches/patch-src_extension_implementation_script.cpp |   24 +-
 graphics/inkscape/patches/patch-src_path-prefix.cpp                     |   10 +-
 9 files changed, 734 insertions(+), 138 deletions(-)

diffs (truncated from 1315 to 300 lines):

diff -r 94c52a126f83 -r 3e12d3919a60 graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile        Thu Jul 01 22:40:27 2021 +0000
+++ b/graphics/inkscape/Makefile        Fri Jul 02 06:59:15 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.235 2021/06/10 11:06:22 wiz Exp $
+# $NetBSD: Makefile,v 1.236 2021/07/02 06:59:15 wiz Exp $
 
-DISTNAME=      inkscape-1.0.2
-PKGREVISION=   7
+DISTNAME=      inkscape-1.1
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +10,7 @@
 COMMENT=       Scalable Vector Graphics (SVG) editor
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/inkscape-1.0.2_2021-01-15_e86c870879
+WRKSRC=                ${WRKDIR}/inkscape-1.1_2021-05-24_c4e8f9ed74
 
 .if !exists(/usr/bin/iconv)
 BUILD_DEPENDS+=                libiconv-[0-9]*:../../converters/libiconv
@@ -31,7 +30,7 @@
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/inkscape
 
 USE_CMAKE=             yes
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++17
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            intltool msgfmt msgmerge perl pkg-config
@@ -42,8 +41,6 @@
 
 UNLIMIT_RESOURCES=     datasize
 
-LDFLAGS.DragonFly=     -lX11
-
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 SUBST_CLASSES+=                pypath
@@ -57,6 +54,12 @@
 SUBST_FILES.pycmd+=    share/*/CMakeLists.txt
 SUBST_SED.pycmd=       -e "s,COMMAND python3,COMMAND ${PYTHONBIN},g"
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       pre-configure
+SUBST_MESSAGE.xdg=     Replacing xdg search path.
+SUBST_FILES.xdg+=      src/inkscape-main.cpp
+SUBST_SED.xdg=         -e 's,xdg_data_dirs = "/usr/local/share/:/usr/share/",xdg_data_dirs = "'${PREFIX}'/share/",'
+
 REPLACE_PYTHON+=       share/extensions/*.py
 
 CHECK_INTERPRETER_SKIP+=       share/inkscape/extensions/genpofiles.sh
@@ -69,16 +72,11 @@
 
 MANCOMPRESSED= yes
 
-.include "options.mk"
-
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 CMAKE_ARGS+=   -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
 .endif
 
-post-extract:
-       ${RM} -r ${WRKSRC}/share/extensions/.pytest_cache
-
 # There exists some race condition in create_default_templates.py that
 # makes default.es_MX.svg sometimes not get installed.
 # (gettext translation file dependency not correctly expressed in cmake?)
@@ -93,10 +91,14 @@
 .include "../../converters/libwpg/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/gdl/buildlink3.mk"
 .include "../../devel/googletest/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsigcpp+=      libsigc++>=2.0.12
 .include "../../devel/libsigc++/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pango+=  pango>=1.42
 .include "../../devel/pango/buildlink3.mk"
+BUILDLINK_API_DEPENDS.harfbuzz+=       harfbuzz>=2.2
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -108,14 +110,8 @@
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/gtkspell3/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtkmm3+= gtkmm3>=3.24
 .include "../../x11/gtkmm3/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.gtk3:Mquartz}
-.include "../../x11/gtk-mac-integration/buildlink3.mk"
-.else
-.include "../../x11/libXext/buildlink3.mk"
-.endif
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/atomic64.mk"
diff -r 94c52a126f83 -r 3e12d3919a60 graphics/inkscape/PLIST
--- a/graphics/inkscape/PLIST   Thu Jul 01 22:40:27 2021 +0000
+++ b/graphics/inkscape/PLIST   Fri Jul 02 06:59:15 2021 +0000
@@ -1,7 +1,104 @@
-@comment $NetBSD: PLIST,v 1.32 2021/04/09 11:18:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.33 2021/07/02 06:59:15 wiz Exp $
 bin/inkscape
 bin/inkview
-lib/libinkscape_base.so
+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
+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/pkgconfig/2geom.pc
 man/de/man1/inkscape.1
 man/de/man1/inkview.1
 man/es/man1/inkview.1
@@ -14,6 +111,8 @@
 man/man1/inkscape.1
 man/man1/inkview.1
 man/pt_BR/man1/inkview.1
+man/zh_TW/man1/inkscape.1
+man/zh_TW/man1/inkview.1
 share/applications/org.inkscape.Inkscape.desktop
 share/bash-completion/completions/inkscape
 share/icons/hicolor/16x16/apps/org.inkscape.Inkscape.png
@@ -22,18 +121,32 @@
 share/icons/hicolor/256x256/apps/org.inkscape.Inkscape.png
 share/icons/hicolor/32x32/apps/org.inkscape.Inkscape.png
 share/icons/hicolor/48x48/apps/org.inkscape.Inkscape.png
+share/icons/hicolor/scalable/apps/org.inkscape.Inkscape.svg
+share/icons/hicolor/symbolic/apps/org.inkscape.Inkscape-symbolic.svg
 share/inkscape/attributes/README
 share/inkscape/attributes/css_defaults
 share/inkscape/attributes/cssprops
 share/inkscape/attributes/svgprops
 share/inkscape/branding/README
 share/inkscape/branding/inkscape-flat.svg
+share/inkscape/branding/inkscape-mac.svg
 share/inkscape/branding/inkscape-text.svg
 share/inkscape/branding/inkscape.svg
 share/inkscape/branding/sodipodi.svg
 share/inkscape/branding/tux.svg
 share/inkscape/doc/AUTHORS
 share/inkscape/doc/COPYING
+share/inkscape/doc/GPL-2.0-or-later.txt
+share/inkscape/doc/GPL-2.0.txt
+share/inkscape/doc/GPL-3.0-or-later.txt
+share/inkscape/doc/GPL-3.0.txt
+share/inkscape/doc/LGPL-2.1-or-later.txt
+share/inkscape/doc/LGPL-2.1.txt
+share/inkscape/doc/LGPL-3.0-or-later.txt
+share/inkscape/doc/LGPL-3.0.txt
+share/inkscape/doc/LICENSE
+share/inkscape/doc/MPL-1.1.txt
+share/inkscape/doc/OFL-1.1.txt
 share/inkscape/doc/TRANSLATORS
 share/inkscape/examples/README
 share/inkscape/examples/animated-clock.svg
@@ -98,6 +211,7 @@
 share/inkscape/extensions/Poly3DObjects/trunc_tet.obj
 share/inkscape/extensions/README.md
 share/inkscape/extensions/STYLEGUIDE.md
+share/inkscape/extensions/TESTING.md
 share/inkscape/extensions/addnodes.inx
 share/inkscape/extensions/addnodes.py
 share/inkscape/extensions/aisvg.inx
@@ -253,18 +367,16 @@
 share/inkscape/extensions/dxf14_style.txt
 share/inkscape/extensions/dxf_input.inx
 share/inkscape/extensions/dxf_input.py
+share/inkscape/extensions/dxf_input_text_scale_factor.svg
 share/inkscape/extensions/dxf_outlines.inx
 share/inkscape/extensions/dxf_outlines.py
 share/inkscape/extensions/edge3d.inx
 share/inkscape/extensions/edge3d.py
-share/inkscape/extensions/embedimage.inx
-share/inkscape/extensions/embedimage.py
-share/inkscape/extensions/embedselectedimages.inx
 share/inkscape/extensions/eps_input.inx
 share/inkscape/extensions/export_gimp_palette.inx
 share/inkscape/extensions/export_gimp_palette.py
-share/inkscape/extensions/extractimage.inx
-share/inkscape/extensions/extractimage.py
+share/inkscape/extensions/extension-manager-bootstrap.inx
+share/inkscape/extensions/extension-manager-bootstrap.py
 share/inkscape/extensions/extrude.inx
 share/inkscape/extensions/extrude.py
 share/inkscape/extensions/fig_input.inx
@@ -318,6 +430,11 @@
 share/inkscape/extensions/hpgl_output.py
 share/inkscape/extensions/image_attributes.inx
 share/inkscape/extensions/image_attributes.py
+share/inkscape/extensions/image_embed.inx
+share/inkscape/extensions/image_embed.py
+share/inkscape/extensions/image_embed_selected.inx
+share/inkscape/extensions/image_extract.inx
+share/inkscape/extensions/image_extract.py
 share/inkscape/extensions/ink2canvas.inx
 share/inkscape/extensions/ink2canvas.py
 share/inkscape/extensions/ink2canvas_lib/__init__.py
@@ -350,7 +467,9 @@
 share/inkscape/extensions/inkex/elements/_svg.py
 share/inkscape/extensions/inkex/elements/_text.py
 share/inkscape/extensions/inkex/elements/_use.py



Home | Main Index | Thread Index | Old Index