[PR PATCH] libmypaint: update to 1.6.1

[PR PATCH] libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 1851 bytes --]

There is a new pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/29972

libmypaint: update to 1.6.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
#### Comments
mypaint : (2.0.1) remove SVG fix : no "xmlns:ns7" present
gimp : (xlint) see https://github.com/void-linux/void-packages/pull/28353#issuecomment-770355667

Built & installed successfully locally for x86_64/-musl, however I only use/tested gimp.

A patch file from https://github.com/void-linux/void-packages/pull/29972.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-29972.patch --]
[-- Type: text/x-diff, Size: 6402 bytes --]

From 5b76e307b07fdb1c2f4470e4fb998e2a5efe113e Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:47:48 +0200
Subject: [PATCH 1/4] libmypaint: update to 1.6.1

---
 common/shlibs               |  2 +-
 srcpkgs/libmypaint/template | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..3b819863e555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
 libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
-libmypaint-1.5.so.1 libmypaint-1.5.1_1
+libmypaint.so.0 libmypaint-1.6.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template
index e8e68dc8590f..096745d6e02e 100644
--- a/srcpkgs/libmypaint/template
+++ b/srcpkgs/libmypaint/template
@@ -1,7 +1,7 @@
 # Template file for 'libmypaint'
 pkgname=libmypaint
-version=1.5.1
-revision=2
+version=1.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gegl"
 hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)"
@@ -11,11 +11,15 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="ISC"
 homepage="https://github.com/mypaint/libmypaint"
 distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz"
-checksum=aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b
+checksum=741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f
 
 build_options="gir"
 build_options_default="gir"
 
+post_install() {
+		vlicense COPYING
+}
+
 libmypaint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -23,9 +27,8 @@ libmypaint-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 	}
 }
-
-post_install() {
-	vlicense COPYING
-}

From d6baf66b5406d01f7bcdb7a54eeb918d93950c1c Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 08:51:39 +0000
Subject: [PATCH 2/4] mypaint: update to 2.0.1

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 -----------
 srcpkgs/mypaint/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
deleted file mode 100644
index 9454203a4930..000000000000
--- a/srcpkgs/mypaint/patches/releaseinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/meta.py	2020-02-15 16:05:22.000000000 +0100
-+++ lib/meta.py	2020-03-29 11:40:40.275375283 +0200
-@@ -264,7 +264,7 @@
-         # 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)
-         base_version = relinfo.get(
-             "MYPAINT_VERSION_BASE",
-             base_version,
diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index f3d5266c14bb..efb295af98d5 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,23 +1,23 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"
-makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel libgomp-devel libmypaint-devel mypaint-brushes"
+makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel
+ libgomp-devel libmypaint-devel mypaint-brushes"
 depends="librsvg python3-numpy python3-gobject gtk+3 hicolor-icon-theme mypaint-brushes"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
+changelog="https://github.com/mypaint/mypaint/raw/master/Changelog.md"
 distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
+checksum=f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16
 python_version=3
 
 post_install() {
-	# Fix SVG icons
-	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 	mv $DESTDIR/usr/lib/mypaint/lib/_mypaintlib.cpython*.so \
 		$DESTDIR/usr/lib/mypaint/lib/_mypaintlib.so
 }

From 922c69216aedb237115c9ba6c656bdefeeea45fa Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:12:39 +0000
Subject: [PATCH 3/4] opentoonz: revision bumb to 2

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 503ebf2d789a..3d697cefb54a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.4.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From ac07fff8e39de24f84f88781d5ba444cb0545d6f Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:29:45 +0000
Subject: [PATCH 4/4] gimp: revision bump to 3

---
 srcpkgs/gimp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0378ad139c6e..4dfed7463871 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -37,7 +37,7 @@ pre_configure() {
 libgimp_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 

Re: libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#issuecomment-812855963

Comment:
Do I understand this right I should use instead,
```
case "$XBPS_TARGET_MACHINE" in
       i686*|x86_64*)
             if [ "$build_option_gir" ]; then
                   vmove "usr/share/gir-*"
             fi;;
esac
```
or completly remove it at it used to be?

Re: libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#issuecomment-812864373

Comment:
Try to force gir in the libmypaint configure args. You might have to patch the build system, since they could be disallowing it for cross builds.

Re: [PR PATCH] [Updated] libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/29972

libmypaint: update to 1.6.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
#### Comments
mypaint : (2.0.1) remove SVG fix : no "xmlns:ns7" present
gimp : (xlint) see https://github.com/void-linux/void-packages/pull/28353#issuecomment-770355667

Built & installed successfully locally for x86_64/-musl, however I only use/tested gimp.

A patch file from https://github.com/void-linux/void-packages/pull/29972.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-29972.patch --]
[-- Type: text/x-diff, Size: 6463 bytes --]

From e8d14f9abcd8b0bef1e8db662513e0f66067c8eb Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:47:48 +0200
Subject: [PATCH 1/4] libmypaint: update to 1.6.1

---
 common/shlibs               |  2 +-
 srcpkgs/libmypaint/template | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..3b819863e555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
 libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
-libmypaint-1.5.so.1 libmypaint-1.5.1_1
+libmypaint.so.0 libmypaint-1.6.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template
index e8e68dc8590f..765ed8ff9bcd 100644
--- a/srcpkgs/libmypaint/template
+++ b/srcpkgs/libmypaint/template
@@ -1,20 +1,21 @@
 # Template file for 'libmypaint'
 pkgname=libmypaint
-version=1.5.1
-revision=2
+version=1.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gegl"
-hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)"
+hostmakedepends="intltool pkg-config gobject-introspection"
 makedepends="json-c-devel glib-devel json-glib-devel"
 short_desc="MyPaint brush engine library"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="ISC"
 homepage="https://github.com/mypaint/libmypaint"
 distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz"
-checksum=aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b
+checksum=741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f
 
-build_options="gir"
-build_options_default="gir"
+post_install() {
+		vlicense COPYING
+}
 
 libmypaint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -23,9 +24,6 @@ libmypaint-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove "usr/share/gir-*"
 	}
 }
-
-post_install() {
-	vlicense COPYING
-}

From a69805fb28ee7f55b52e3ae1640353503c7f05b6 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 08:51:39 +0000
Subject: [PATCH 2/4] mypaint: update to 2.0.1

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 -----------
 srcpkgs/mypaint/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
deleted file mode 100644
index 9454203a4930..000000000000
--- a/srcpkgs/mypaint/patches/releaseinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/meta.py	2020-02-15 16:05:22.000000000 +0100
-+++ lib/meta.py	2020-03-29 11:40:40.275375283 +0200
-@@ -264,7 +264,7 @@
-         # 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)
-         base_version = relinfo.get(
-             "MYPAINT_VERSION_BASE",
-             base_version,
diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index f3d5266c14bb..efb295af98d5 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,23 +1,23 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"
-makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel libgomp-devel libmypaint-devel mypaint-brushes"
+makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel
+ libgomp-devel libmypaint-devel mypaint-brushes"
 depends="librsvg python3-numpy python3-gobject gtk+3 hicolor-icon-theme mypaint-brushes"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
+changelog="https://github.com/mypaint/mypaint/raw/master/Changelog.md"
 distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
+checksum=f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16
 python_version=3
 
 post_install() {
-	# Fix SVG icons
-	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 	mv $DESTDIR/usr/lib/mypaint/lib/_mypaintlib.cpython*.so \
 		$DESTDIR/usr/lib/mypaint/lib/_mypaintlib.so
 }

From 4140fd45a6d9ddfde5e8fb3ff40ec14678a179f3 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:12:39 +0000
Subject: [PATCH 3/4] opentoonz: revision bumb to 2

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 503ebf2d789a..3d697cefb54a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.4.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From 3b9698a54a170ad1d1013ef0d057e0221020d43d Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:29:45 +0000
Subject: [PATCH 4/4] gimp: revision bump to 3

---
 srcpkgs/gimp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0378ad139c6e..4dfed7463871 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -37,7 +37,7 @@ pre_configure() {
 libgimp_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 

Re: libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#issuecomment-813188239

Comment:
@ericonr hm cross build locally it works, lookin into it again, sorry

Re: [PR PATCH] [Updated] libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/29972

libmypaint: update to 1.6.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
#### Comments
mypaint : (2.0.1) remove SVG fix : no "xmlns:ns7" present
gimp : (xlint) see https://github.com/void-linux/void-packages/pull/28353#issuecomment-770355667

Built & installed successfully locally for x86_64/-musl, however I only use/tested gimp.

A patch file from https://github.com/void-linux/void-packages/pull/29972.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-29972.patch --]
[-- Type: text/x-diff, Size: 6463 bytes --]

From e8d14f9abcd8b0bef1e8db662513e0f66067c8eb Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:47:48 +0200
Subject: [PATCH 1/4] libmypaint: update to 1.6.1

---
 common/shlibs               |  2 +-
 srcpkgs/libmypaint/template | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..3b819863e555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
 libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
-libmypaint-1.5.so.1 libmypaint-1.5.1_1
+libmypaint.so.0 libmypaint-1.6.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template
index e8e68dc8590f..765ed8ff9bcd 100644
--- a/srcpkgs/libmypaint/template
+++ b/srcpkgs/libmypaint/template
@@ -1,20 +1,21 @@
 # Template file for 'libmypaint'
 pkgname=libmypaint
-version=1.5.1
-revision=2
+version=1.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gegl"
-hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)"
+hostmakedepends="intltool pkg-config gobject-introspection"
 makedepends="json-c-devel glib-devel json-glib-devel"
 short_desc="MyPaint brush engine library"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="ISC"
 homepage="https://github.com/mypaint/libmypaint"
 distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz"
-checksum=aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b
+checksum=741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f
 
-build_options="gir"
-build_options_default="gir"
+post_install() {
+		vlicense COPYING
+}
 
 libmypaint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -23,9 +24,6 @@ libmypaint-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove "usr/share/gir-*"
 	}
 }
-
-post_install() {
-	vlicense COPYING
-}

From a69805fb28ee7f55b52e3ae1640353503c7f05b6 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 08:51:39 +0000
Subject: [PATCH 2/4] mypaint: update to 2.0.1

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 -----------
 srcpkgs/mypaint/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
deleted file mode 100644
index 9454203a4930..000000000000
--- a/srcpkgs/mypaint/patches/releaseinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/meta.py	2020-02-15 16:05:22.000000000 +0100
-+++ lib/meta.py	2020-03-29 11:40:40.275375283 +0200
-@@ -264,7 +264,7 @@
-         # 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)
-         base_version = relinfo.get(
-             "MYPAINT_VERSION_BASE",
-             base_version,
diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index f3d5266c14bb..efb295af98d5 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,23 +1,23 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"
-makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel libgomp-devel libmypaint-devel mypaint-brushes"
+makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel
+ libgomp-devel libmypaint-devel mypaint-brushes"
 depends="librsvg python3-numpy python3-gobject gtk+3 hicolor-icon-theme mypaint-brushes"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
+changelog="https://github.com/mypaint/mypaint/raw/master/Changelog.md"
 distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
+checksum=f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16
 python_version=3
 
 post_install() {
-	# Fix SVG icons
-	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 	mv $DESTDIR/usr/lib/mypaint/lib/_mypaintlib.cpython*.so \
 		$DESTDIR/usr/lib/mypaint/lib/_mypaintlib.so
 }

From 4140fd45a6d9ddfde5e8fb3ff40ec14678a179f3 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:12:39 +0000
Subject: [PATCH 3/4] opentoonz: revision bumb to 2

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 503ebf2d789a..3d697cefb54a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.4.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From 3b9698a54a170ad1d1013ef0d057e0221020d43d Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:29:45 +0000
Subject: [PATCH 4/4] gimp: revision bump to 3

---
 srcpkgs/gimp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0378ad139c6e..4dfed7463871 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -37,7 +37,7 @@ pre_configure() {
 libgimp_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 

Re: [PR REVIEW] libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#discussion_r607071154

Comment:
Ok, these are *new* files. At least they don't seem to exist in the current version of the package.

In that case, it should be made a build option and `build_options_default="gir"` should only be set for the native build. This way, it's clear that the cross builds are lacking introspection support.

Re: [PR REVIEW] libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#discussion_r607071726

Comment:
I don't think we need to generate them, since they aren't used by GIMP or GEGL, but we do need to be explicit about the differences between the packages.

Re: [PR REVIEW] libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

New review comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#discussion_r607087389

Comment:
@ericonr I'll ponder on your suggestion for a while, but I may suddently find myself in a simpleton spoonfeed posture if it goes all haywire.. but we'll find out eventually

Re: [PR REVIEW] libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#discussion_r607088773

Comment:
It's basically adding a layer of indirection to the `vmove` conditional.

```
if [ -z "$CROSS_BUILD" ]; then
build_options_default="gir"
fi

if [ "$build_option_gir" ]; then
vmove ...
fi
```

Re: [PR PATCH] [Updated] libmypaint: update to 1.6.1

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/29972

libmypaint: update to 1.6.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
#### Comments
mypaint : (2.0.1) remove SVG fix : no "xmlns:ns7" present
gimp : (xlint) see https://github.com/void-linux/void-packages/pull/28353#issuecomment-770355667

Built & installed successfully locally for x86_64/-musl, however I only use/tested gimp.

A patch file from https://github.com/void-linux/void-packages/pull/29972.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-29972.patch --]
[-- Type: text/x-diff, Size: 6434 bytes --]

From 25d17a22322e6ff196b36f1cf99c1cf4c6dae280 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:47:48 +0200
Subject: [PATCH 1/4] libmypaint: update to 1.6.1

---
 common/shlibs               |  2 +-
 srcpkgs/libmypaint/template | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..3b819863e555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
 libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
-libmypaint-1.5.so.1 libmypaint-1.5.1_1
+libmypaint.so.0 libmypaint-1.6.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template
index e8e68dc8590f..cf324beff207 100644
--- a/srcpkgs/libmypaint/template
+++ b/srcpkgs/libmypaint/template
@@ -1,7 +1,7 @@
 # Template file for 'libmypaint'
 pkgname=libmypaint
-version=1.5.1
-revision=2
+version=1.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gegl"
 hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)"
@@ -11,10 +11,16 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="ISC"
 homepage="https://github.com/mypaint/libmypaint"
 distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz"
-checksum=aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b
+checksum=741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f
 
 build_options="gir"
-build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+post_install() {
+	vlicense COPYING
+}
 
 libmypaint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -23,9 +29,8 @@ libmypaint-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 	}
 }
-
-post_install() {
-	vlicense COPYING
-}

From a0c6e076db50a13257ddf4450e124140e807ae55 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 08:51:39 +0000
Subject: [PATCH 2/4] mypaint: update to 2.0.1

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 -----------
 srcpkgs/mypaint/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
deleted file mode 100644
index 9454203a4930..000000000000
--- a/srcpkgs/mypaint/patches/releaseinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/meta.py	2020-02-15 16:05:22.000000000 +0100
-+++ lib/meta.py	2020-03-29 11:40:40.275375283 +0200
-@@ -264,7 +264,7 @@
-         # 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)
-         base_version = relinfo.get(
-             "MYPAINT_VERSION_BASE",
-             base_version,
diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index f3d5266c14bb..efb295af98d5 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,23 +1,23 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"
-makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel libgomp-devel libmypaint-devel mypaint-brushes"
+makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel
+ libgomp-devel libmypaint-devel mypaint-brushes"
 depends="librsvg python3-numpy python3-gobject gtk+3 hicolor-icon-theme mypaint-brushes"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
+changelog="https://github.com/mypaint/mypaint/raw/master/Changelog.md"
 distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
+checksum=f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16
 python_version=3
 
 post_install() {
-	# Fix SVG icons
-	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 	mv $DESTDIR/usr/lib/mypaint/lib/_mypaintlib.cpython*.so \
 		$DESTDIR/usr/lib/mypaint/lib/_mypaintlib.so
 }

From 8809add9fd91a512c75d71128a53fb74878bce23 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:12:39 +0000
Subject: [PATCH 3/4] opentoonz: revision bumb to 2

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 503ebf2d789a..3d697cefb54a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.4.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From 202fa93d628d880290547c9d1d31ded5985d603c Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:29:45 +0000
Subject: [PATCH 4/4] gimp: revision bump to 3

---
 srcpkgs/gimp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0378ad139c6e..4dfed7463871 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -37,7 +37,7 @@ pre_configure() {
 libgimp_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 

Re: [PR PATCH] [Updated] libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/29972

libmypaint: update to 1.6.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
#### Comments
mypaint : (2.0.1) remove SVG fix : no "xmlns:ns7" present
gimp : (xlint) see https://github.com/void-linux/void-packages/pull/28353#issuecomment-770355667

Built & installed successfully locally for x86_64/-musl, however I only use/tested gimp.

A patch file from https://github.com/void-linux/void-packages/pull/29972.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-29972.patch --]
[-- Type: text/x-diff, Size: 6572 bytes --]

From 93963e009fd805c1a529cb0f8d6afa54e8917021 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:47:48 +0200
Subject: [PATCH 1/4] libmypaint: update to 1.6.1

Since neither GIMP or mypaint use the gobject-introspection, we don't
have to hack around it for cross targets, at least not yet.
---
 common/shlibs               |  2 +-
 srcpkgs/libmypaint/template | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9aa0a601250b..40faf29b113a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
 libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
-libmypaint-1.5.so.1 libmypaint-1.5.1_1
+libmypaint.so.0 libmypaint-1.6.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template
index e8e68dc8590f..cf324beff207 100644
--- a/srcpkgs/libmypaint/template
+++ b/srcpkgs/libmypaint/template
@@ -1,7 +1,7 @@
 # Template file for 'libmypaint'
 pkgname=libmypaint
-version=1.5.1
-revision=2
+version=1.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gegl"
 hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)"
@@ -11,10 +11,16 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="ISC"
 homepage="https://github.com/mypaint/libmypaint"
 distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz"
-checksum=aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b
+checksum=741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f
 
 build_options="gir"
-build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+post_install() {
+	vlicense COPYING
+}
 
 libmypaint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -23,9 +29,8 @@ libmypaint-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 	}
 }
-
-post_install() {
-	vlicense COPYING
-}

From 3f3bee589dc706ed0fb291c94769d77240907f24 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 08:51:39 +0000
Subject: [PATCH 2/4] mypaint: update to 2.0.1

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 -----------
 srcpkgs/mypaint/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
deleted file mode 100644
index 9454203a4930..000000000000
--- a/srcpkgs/mypaint/patches/releaseinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/meta.py	2020-02-15 16:05:22.000000000 +0100
-+++ lib/meta.py	2020-03-29 11:40:40.275375283 +0200
-@@ -264,7 +264,7 @@
-         # 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)
-         base_version = relinfo.get(
-             "MYPAINT_VERSION_BASE",
-             base_version,
diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index f3d5266c14bb..efb295af98d5 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,23 +1,23 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"
-makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel libgomp-devel libmypaint-devel mypaint-brushes"
+makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel
+ libgomp-devel libmypaint-devel mypaint-brushes"
 depends="librsvg python3-numpy python3-gobject gtk+3 hicolor-icon-theme mypaint-brushes"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
+changelog="https://github.com/mypaint/mypaint/raw/master/Changelog.md"
 distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
+checksum=f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16
 python_version=3
 
 post_install() {
-	# Fix SVG icons
-	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 	mv $DESTDIR/usr/lib/mypaint/lib/_mypaintlib.cpython*.so \
 		$DESTDIR/usr/lib/mypaint/lib/_mypaintlib.so
 }

From 4d3a59a025465bfe0de1058ea5f9ab1f7609b7f0 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:12:39 +0000
Subject: [PATCH 3/4] opentoonz: revbump for libmypaint

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 503ebf2d789a..3d697cefb54a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.4.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From a54531e9b073cef654fd5add450f1f493bdd6813 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:29:45 +0000
Subject: [PATCH 4/4] gimp: revbump for libmypaint

---
 srcpkgs/gimp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0378ad139c6e..4dfed7463871 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -37,7 +37,7 @@ pre_configure() {
 libgimp_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 

Re: libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29972#issuecomment-814094971

Comment:
Fixed commit messages

Re: [PR PATCH] [Merged]: libmypaint: update to 1.6.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1700 bytes --]

There's a merged pull request on the void-packages repository

libmypaint: update to 1.6.1
https://github.com/void-linux/void-packages/pull/29972

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
#### Comments
mypaint : (2.0.1) remove SVG fix : no "xmlns:ns7" present
gimp : (xlint) see https://github.com/void-linux/void-packages/pull/28353#issuecomment-770355667

Built & installed successfully locally for x86_64/-musl, however I only use/tested gimp.