CVS commit: pkgsrc/graphics/mypaint

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Thu Jan  9 21:05:49 UTC 2025

Modified Files:
        pkgsrc/graphics/mypaint: Makefile PLIST distinfo
        pkgsrc/graphics/mypaint/patches: patch-lib_meta.py patch-setup.py

Log Message:
mypaint: update to 2.0.1

- libmypaint requirement bumped to >= 1.6.
- Undo/Redo stack default size increased to 40.
- Translated strings added/updated for several languages.
- Svg icon sizes reduced across the board.
- many bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/mypaint/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/mypaint/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/mypaint/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/mypaint/patches/patch-lib_meta.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/mypaint/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/graphics/mypaint/Makefile
diff -u pkgsrc/graphics/mypaint/Makefile:1.72 pkgsrc/graphics/mypaint/Makefile:1.73
--- pkgsrc/graphics/mypaint/Makefile:1.72       Fri Dec 27 08:20:00 2024
+++ pkgsrc/graphics/mypaint/Makefile    Thu Jan  9 21:05:49 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2024/12/27 08:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2025/01/09 21:05:49 ktnb Exp $
 
-DISTNAME=      mypaint-2.0.0
+DISTNAME=      mypaint-2.0.1
 PKGREVISION=   23
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mypaint/}

Index: pkgsrc/graphics/mypaint/PLIST
diff -u pkgsrc/graphics/mypaint/PLIST:1.5 pkgsrc/graphics/mypaint/PLIST:1.6
--- pkgsrc/graphics/mypaint/PLIST:1.5   Wed Mar  4 13:51:51 2020
+++ pkgsrc/graphics/mypaint/PLIST       Thu Jan  9 21:05:49 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/03/04 13:51:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/01/09 21:05:49 ktnb Exp $
 bin/mypaint
 bin/mypaint-ora-thumbnailer
 lib/mypaint/${EGG_INFODIR}/PKG-INFO
@@ -346,9 +346,9 @@ lib/mypaint/lib/gettext.pyo
 lib/mypaint/lib/gettext_setup.py
 lib/mypaint/lib/gettext_setup.pyc
 lib/mypaint/lib/gettext_setup.pyo
-lib/mypaint/lib/gichecks.py
-lib/mypaint/lib/gichecks.pyc
-lib/mypaint/lib/gichecks.pyo
+lib/mypaint/lib/gibindings.py
+lib/mypaint/lib/gibindings.pyc
+lib/mypaint/lib/gibindings.pyo
 lib/mypaint/lib/glib.py
 lib/mypaint/lib/glib.pyc
 lib/mypaint/lib/glib.pyo
@@ -433,12 +433,14 @@ lib/mypaint/lib/surface.pyo
 lib/mypaint/lib/tiledsurface.py
 lib/mypaint/lib/tiledsurface.pyc
 lib/mypaint/lib/tiledsurface.pyo
+lib/mypaint/lib/validation.py
+lib/mypaint/lib/validation.pyc
+lib/mypaint/lib/validation.pyo
 lib/mypaint/lib/xml.py
 lib/mypaint/lib/xml.pyc
 lib/mypaint/lib/xml.pyo
 share/applications/mypaint.desktop
 share/icons/hicolor/16x16/actions/mypaint-tool-color-palette.png
-share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png
 share/icons/hicolor/16x16/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png
@@ -449,7 +451,6 @@ share/icons/hicolor/16x16/actions/mypain
 share/icons/hicolor/16x16/actions/mypaint-tool-rings-color-changer.png
 share/icons/hicolor/16x16/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/22x22/actions/mypaint-tool-color-palette.png
-share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png
 share/icons/hicolor/22x22/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png
@@ -497,7 +498,6 @@ share/icons/hicolor/24x24/actions/mypain
 share/icons/hicolor/24x24/actions/mypaint-target-layer-symbolic.svg
 share/icons/hicolor/24x24/actions/mypaint-target-stroke-symbolic.svg
 share/icons/hicolor/24x24/actions/mypaint-tool-color-palette.png
-share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png
 share/icons/hicolor/24x24/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png
@@ -522,7 +522,6 @@ share/icons/hicolor/24x24/actions/mypain
 share/icons/hicolor/24x24/actions/mypaint-view-zoom-more-symbolic.svg
 share/icons/hicolor/24x24/actions/mypaint-view-zoom-symbolic.svg
 share/icons/hicolor/32x32/actions/mypaint-tool-color-palette.png
-share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png
 share/icons/hicolor/32x32/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png
@@ -533,7 +532,6 @@ share/icons/hicolor/32x32/actions/mypain
 share/icons/hicolor/32x32/actions/mypaint-tool-rings-color-changer.png
 share/icons/hicolor/32x32/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/48x48/actions/mypaint-tool-color-palette.png
-share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png
 share/icons/hicolor/48x48/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png
@@ -605,7 +603,6 @@ share/icons/hicolor/scalable/actions/myp
 share/icons/hicolor/scalable/actions/mypaint-line-sequence-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-lines-and-curves-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-lock-alpha-symbolic.svg
-share/icons/hicolor/scalable/actions/mypaint-normal-paint-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-object-hidden-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-object-locked-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-object-move-symbolic.svg
@@ -632,7 +629,6 @@ share/icons/hicolor/scalable/actions/myp
 share/icons/hicolor/scalable/actions/mypaint-scratchpad-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-stroke-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-symmetry-symbolic.svg
-share/icons/hicolor/scalable/actions/mypaint-symmetry.svg
 share/icons/hicolor/scalable/actions/mypaint-tab-options-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-tab-sidebar-swap-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-target-brush-symbolic.svg
@@ -640,7 +636,6 @@ share/icons/hicolor/scalable/actions/myp
 share/icons/hicolor/scalable/actions/mypaint-target-stroke-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-target-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-color-palette.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-color-rgb.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-component-sliders.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hcywheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hsvcube.svg
@@ -882,3 +877,4 @@ share/mypaint/pixmaps/layers.png
 share/mypaint/pixmaps/mypaint_logo.png
 share/mypaint/pixmaps/plus.png
 share/thumbnailers/mypaint-ora.thumbnailer
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages

Index: pkgsrc/graphics/mypaint/distinfo
diff -u pkgsrc/graphics/mypaint/distinfo:1.14 pkgsrc/graphics/mypaint/distinfo:1.15
--- pkgsrc/graphics/mypaint/distinfo:1.14       Sun Jan 28 08:19:18 2024
+++ pkgsrc/graphics/mypaint/distinfo    Thu Jan  9 21:05:49 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2024/01/28 08:19:18 wiz Exp $
+$NetBSD: distinfo,v 1.15 2025/01/09 21:05:49 ktnb Exp $
 
-BLAKE2s (mypaint-2.0.0.tar.xz) = b12a8e163e3f362b079a4e672502e0b2f2e0ca0ccd360942cb9a36f8fee3892d
-SHA512 (mypaint-2.0.0.tar.xz) = 118d905f4d7ce6adb9779b59d6b3f51b94a9937778b8fe3ed1b31c9b5b77d63110134bdc74849a91d8095e905664227ff43ffe183ad9c7c7ba18fa954ade8a84
-Size (mypaint-2.0.0.tar.xz) = 7316680 bytes
+BLAKE2s (mypaint-2.0.1.tar.xz) = e2f8fb826f5c727fe61d0a18e388508cae1a7bb960c6454870ac1f3512b3053b
+SHA512 (mypaint-2.0.1.tar.xz) = 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
+Size (mypaint-2.0.1.tar.xz) = 7295048 bytes
 SHA1 (patch-lib_gettext__setup.py) = 08a93e37a410f7a7392e575fa06c10bdd13e6ef6
-SHA1 (patch-lib_meta.py) = 1c8832ff06154255d7ea14037dc728d1fa0ba50e
-SHA1 (patch-setup.py) = 399bed73657bb7abf1a949e83f39ca0e0e9821fb
+SHA1 (patch-lib_meta.py) = 1295dbaf9096ef2d483063ad8a0a38d7c2462c77
+SHA1 (patch-setup.py) = 18cc4b286550bf142a2769c45f53762367d114fe

Index: pkgsrc/graphics/mypaint/patches/patch-lib_meta.py
diff -u pkgsrc/graphics/mypaint/patches/patch-lib_meta.py:1.1 pkgsrc/graphics/mypaint/patches/patch-lib_meta.py:1.2
--- pkgsrc/graphics/mypaint/patches/patch-lib_meta.py:1.1       Wed Mar  4 13:51:51 2020
+++ pkgsrc/graphics/mypaint/patches/patch-lib_meta.py   Thu Jan  9 21:05:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_meta.py,v 1.1 2020/03/04 13:51:51 wiz Exp $
+$NetBSD: patch-lib_meta.py,v 1.2 2025/01/09 21:05:49 ktnb Exp $
 
 Fix error with python-3.7:
 
@@ -8,14 +8,14 @@ Fix error with python-3.7:
     exec(relinfo_fp, relinfo)
 TypeError: exec() arg 1 must be a string, bytes or code object
 
---- lib/meta.py.orig   2020-02-15 15:05:22.000000000 +0000
+--- lib/meta.py.orig   2020-05-29 16:40:02.000000000 +0000
 +++ lib/meta.py
-@@ -263,8 +263,7 @@ def _get_versions(gitprefix="gitexport")
+@@ -272,8 +272,7 @@ def _get_versions(gitprefix="gitexport")
      if os.path.isfile("release_info"):
          # If release information from release.sh exists, use that
          relinfo = {}
 -        with open("release_info", "rb") as relinfo_fp:
--            exec(relinfo_fp, relinfo)
+-            exec(relinfo_fp.read(), relinfo)
 +        exec(open("release_info").read())
          base_version = relinfo.get(
              "MYPAINT_VERSION_BASE",

Index: pkgsrc/graphics/mypaint/patches/patch-setup.py
diff -u pkgsrc/graphics/mypaint/patches/patch-setup.py:1.2 pkgsrc/graphics/mypaint/patches/patch-setup.py:1.3
--- pkgsrc/graphics/mypaint/patches/patch-setup.py:1.2  Sun Jan 28 08:19:19 2024
+++ pkgsrc/graphics/mypaint/patches/patch-setup.py      Thu Jan  9 21:05:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.2 2024/01/28 08:19:19 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2025/01/09 21:05:49 ktnb Exp $
 
 First chunk:
 https://github.com/mypaint/mypaint/commit/032a155b72f2b021f66a994050d83f07342d04af
@@ -8,9 +8,12 @@ Don't force pure standard mode as it dep
 anyway. Explicitly set _NETBSD_SOURCE since Python's config.h pollutes
 the namespace with it.
 
---- setup.py.orig      2024-01-28 08:16:11.582259663 +0000
+Chunk four:
+Upstream forgot to update the version here
+
+--- setup.py.orig      2020-05-29 16:40:02.000000000 +0000
 +++ setup.py
-@@ -570,7 +570,7 @@ class InstallScripts (install_scripts):
+@@ -632,7 +632,7 @@ class InstallScripts (install_scripts):
          self.announce("installing %s as %s" % (src, targ_basename), level=2)
          if self.dry_run:
              return []
@@ -19,21 +22,30 @@ the namespace with it.
              with open(targ, "w") as out_fp:
                  line = in_fp.readline().rstrip()
                  if line.startswith("#!"):
-@@ -801,7 +801,7 @@ def get_ext_modules():
+@@ -863,7 +863,7 @@ def get_ext_modules():
      import numpy
  
      extra_compile_args = [
 -        '--std=c++11',
-+        '-std=gnu++11',
++        '--std=gnu++11',
          '-Wall',
          '-Wno-sign-compare',
          '-Wno-write-strings',
-@@ -821,6 +821,8 @@ def get_ext_modules():
+@@ -883,6 +883,8 @@ def get_ext_modules():
          # Look up libraries dependencies relative to the library.
          extra_link_args.append('-Wl,-z,origin')
          extra_link_args.append('-Wl,-rpath,$ORIGIN')
 +    if sys.platform.startswith("netbsd"):
 +        extra_compile_args.append("-D_NETBSD_SOURCE")
  
-     initial_deps = ["libmypaint >= 1.5"]
+     initial_deps = ["%s >= 1.6" % LIBMYPAINT]
      remaining_deps = [
+@@ -978,7 +980,7 @@ def get_data_files():
+ 
+ setup(
+     name='MyPaint',
+-    version='2.0.0a0',
++    version='2.0.1a0',
+     description='Simple painting program for use with graphics tablets.',
+     author='Andrew Chadwick',
+     author_email='a.t.chadwick%gmail.com@localhost',