CVS commit: pkgsrc/graphics/inkscape

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Apr  9 11:18:24 UTC 2021

Modified Files:
        pkgsrc/graphics/inkscape: Makefile PLIST distinfo
Removed Files:
        pkgsrc/graphics/inkscape/patches: patch-src_ui_tool_node.cpp

Log Message:
inkscape: updated to 1.0.2

inkscape: updated to 1.0.2

Inkscape 1.0.2

This is a bugfix release:
- More granular controls for canvas zooming and rotation
- Fixes extensions popping up when a clipboard manager was used
- Several crashes fixed


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/inkscape/PLIST
cvs rdiff -u -r1.78 -r1.79 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/inkscape/patches/patch-src_ui_tool_node.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.226 pkgsrc/graphics/inkscape/Makefile:1.227
--- pkgsrc/graphics/inkscape/Makefile:1.226     Fri Apr  9 06:55:01 2021
+++ pkgsrc/graphics/inkscape/Makefile   Fri Apr  9 11:18:24 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.226 2021/04/09 06:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.227 2021/04/09 11:18:24 adam Exp $
 
-DISTNAME=      inkscape-1.0.1
-PKGREVISION=   6
+DISTNAME=      inkscape-1.0.2
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +10,7 @@ HOMEPAGE=     https://www.inkscape.org/
 COMMENT=       Scalable Vector Graphics (SVG) editor
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/inkscape-1.0.1_2020-09-07_3bc2e813f5
+WRKSRC=                ${WRKDIR}/inkscape-1.0.2_2021-01-15_e86c870879
 
 .if !exists(/usr/bin/iconv)
 BUILD_DEPENDS+=        libiconv-[0-9]*:../../converters/libiconv
@@ -64,6 +63,7 @@ CHECK_INTERPRETER_SKIP+=      share/inkscape/
 CHECK_PORTABILITY_SKIP+=       packaging/macosx/Resources/bin/inkscape
 CHECK_PORTABILITY_SKIP+=       packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
 
+CMAKE_ARGS+=   -DINKSCAPE_INSTALL_LIBDIR=${PREFIX}/lib
 CMAKE_ARGS+=   -DPACKAGE_LOCALE_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
 
 MANCOMPRESSED= yes
@@ -75,12 +75,15 @@ MANCOMPRESSED=      yes
 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?)
 # Run the script post-build to ensure all files are generated.
 post-build:
-       cd ${WRKSRC} && ${PYTHONBIN} ./share/templates/create_default_templates.py . .
+       cd ${WRKSRC} && ${PYTHONBIN} share/templates/create_default_templates.py . .
 
 BUILDLINK_API_DEPENDS.boehm-gc+=       boehm-gc>=7.4
 .include "../../converters/libcdr/buildlink3.mk"
@@ -93,7 +96,6 @@ BUILDLINK_API_DEPENDS.boehm-gc+=      boehm-g
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -108,10 +110,13 @@ BUILDLINK_API_DEPENDS.boehm-gc+=  boehm-g
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtkmm3/buildlink3.mk"
-.if ${OPSYS} != "Darwin"
+.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"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/inkscape/PLIST
diff -u pkgsrc/graphics/inkscape/PLIST:1.31 pkgsrc/graphics/inkscape/PLIST:1.32
--- pkgsrc/graphics/inkscape/PLIST:1.31 Tue Sep  8 13:25:14 2020
+++ pkgsrc/graphics/inkscape/PLIST      Fri Apr  9 11:18:24 2021
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.31 2020/09/08 13:25:14 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2021/04/09 11:18:24 adam Exp $
 bin/inkscape
 bin/inkview
-lib/inkscape/libinkscape_base.so
+lib/libinkscape_base.so
 man/de/man1/inkscape.1
 man/de/man1/inkview.1
 man/es/man1/inkview.1

Index: pkgsrc/graphics/inkscape/distinfo
diff -u pkgsrc/graphics/inkscape/distinfo:1.78 pkgsrc/graphics/inkscape/distinfo:1.79
--- pkgsrc/graphics/inkscape/distinfo:1.78      Tue Mar 23 09:57:35 2021
+++ pkgsrc/graphics/inkscape/distinfo   Fri Apr  9 11:18:24 2021
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.78 2021/03/23 09:57:35 ryoon Exp $
+$NetBSD: distinfo,v 1.79 2021/04/09 11:18:24 adam Exp $
 
-SHA1 (inkscape-1.0.1.tar.xz) = f04277c8476ab572fa099b4439bff6323c89470e
-RMD160 (inkscape-1.0.1.tar.xz) = c93974227d33674c3c840cd8706cec9761e8cb7c
-SHA512 (inkscape-1.0.1.tar.xz) = 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
-Size (inkscape-1.0.1.tar.xz) = 32051632 bytes
+SHA1 (inkscape-1.0.2.tar.xz) = 17a1c90f49bc45f4068f35a7986f92399f9c1be5
+RMD160 (inkscape-1.0.2.tar.xz) = 9731119b87d2752959f2e303a0c798d4188dcbea
+SHA512 (inkscape-1.0.2.tar.xz) = f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
+Size (inkscape-1.0.2.tar.xz) = 32421620 bytes
 SHA1 (patch-CMakeScripts_Pod2man.cmake) = c60f61a7a3eca511ced5e085dc66670cee8bfe33
 SHA1 (patch-src_3rdparty_autotrace_autotrace.h) = 4f93a25f3134a3fb21531cd264652432d1ab0a79
 SHA1 (patch-src_extension_implementation_script.cpp) = 2c2cbcee2fdda5a274906600930acc0257cc0ea2
 SHA1 (patch-src_path-prefix.cpp) = 1ce20f16063759aab60d9e8da6b25700b44099d2
 SHA1 (patch-src_svg_svg-length.cpp) = 076d30eb83fee4ab87b30791cc566c52baabbb68
-SHA1 (patch-src_ui_tool_node.cpp) = b822fcd2456cd19b6482a7f600a9f29abb9f238d