[PR PATCH] mypaint: update to 1.2.2

[PR PATCH] mypaint: update to 1.2.2

[voidlinux-github]

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

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

https://github.com/teh-jazzman/void-packages mypaint
https://github.com/void-linux/void-packages/pull/17970

mypaint: update to 1.2.2
SWIG compatibility update and SVG icon fixes

Fixes #17841

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

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

From e2fc377714b29f9b8368656f9baddac91553d343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Wed, 1 Jan 2020 15:50:06 +0100
Subject: [PATCH] mypaint: update to 1.2.2

---
 srcpkgs/mypaint/template | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index 75bbd965d7e..25f0c084636 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,19 +1,28 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=1.2.1
-revision=5
+version=1.2.2
+revision=1
 hostmakedepends="scons swig pkg-config"
 makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel
  lcms2-devel gtk+3-devel python-gobject-devel"
-depends="librsvg python-numpy python-gobject"
+depends="librsvg python-numpy python-gobject hicolor-icon-theme"
 pycompile_dirs="/usr/share/mypaint"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
-distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7
+_sversion=beta.0
+_libcommit=f6278c97aa5af443e30069099c6461b056cdfe63
+wrksrc="${pkgname}-${version}-${_sversion}"
+distfiles="https://github.com/mypaint/mypaint/archive/v${version}-${_sversion}.tar.gz
+ https://github.com/mypaint/libmypaint/archive/${_libcommit}.tar.gz"
+checksum="c13130f9675787c2f51f38c03ca206aa80984e7673f674569caf3a06e503db08
+ bb9579d4d2d2a59b2343aa021887091845e0e8a2ff115312d87b9d975210b263"
 
+post_extract() {
+	rm -rf "${wrksrc}/brushlib"
+	mv "${XBPS_BUILDDIR}/libmypaint-${_libcommit}" "${wrksrc}/brushlib"
+}
 do_build() {
 	scons ${makejobs} enable_openmp=1
 }
@@ -23,4 +32,6 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/include
 	rm -f ${DESTDIR}/usr/lib/*.a
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
+	# Fix SVG icons
+	sed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 }

Re: [PR PATCH] [Updated] mypaint: update to 1.2.2

[voidlinux-github]

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

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

https://github.com/teh-jazzman/void-packages mypaint
https://github.com/void-linux/void-packages/pull/17970

mypaint: update to 1.2.2
SWIG compatibility update and SVG icon fixes

Fixes #17841

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

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

From 5ec93acdc7d8cbbcb3383d568131308e0d54ced9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Wed, 1 Jan 2020 15:50:06 +0100
Subject: [PATCH] mypaint: update to 1.2.2

---
 srcpkgs/mypaint/template | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index 75bbd965d7e..1205b91964c 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,19 +1,28 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=1.2.1
-revision=5
+version=1.2.2
+revision=1
+_sversion=beta.0
+_libcommit=f6278c97aa5af443e30069099c6461b056cdfe63
+wrksrc="${pkgname}-${version}-${_sversion}"
+pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="scons swig pkg-config"
 makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel
  lcms2-devel gtk+3-devel python-gobject-devel"
-depends="librsvg python-numpy python-gobject"
-pycompile_dirs="/usr/share/mypaint"
+depends="librsvg python-numpy python-gobject hicolor-icon-theme"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
-distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7
+distfiles="https://github.com/mypaint/mypaint/archive/v${version}-${_sversion}.tar.gz
+ https://github.com/mypaint/libmypaint/archive/${_libcommit}.tar.gz"
+checksum="c13130f9675787c2f51f38c03ca206aa80984e7673f674569caf3a06e503db08
+ bb9579d4d2d2a59b2343aa021887091845e0e8a2ff115312d87b9d975210b263"
 
+post_extract() {
+	rm -rf "${wrksrc}/brushlib"
+	mv "${XBPS_BUILDDIR}/libmypaint-${_libcommit}" "${wrksrc}/brushlib"
+}
 do_build() {
 	scons ${makejobs} enable_openmp=1
 }
@@ -23,4 +32,6 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/include
 	rm -f ${DESTDIR}/usr/lib/*.a
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
+	# Fix SVG icons
+	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 }

Re: [PR PATCH] [Updated] mypaint: update to 1.2.2

[voidlinux-github]

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

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

https://github.com/teh-jazzman/void-packages mypaint
https://github.com/void-linux/void-packages/pull/17970

mypaint: update to 1.2.2
SWIG compatibility update and SVG icon fixes

Fixes #17841

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

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

From a9e631a851bab3caaed8ea25e559160c526f9569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Wed, 1 Jan 2020 15:50:06 +0100
Subject: [PATCH] mypaint: update to 1.2.2

---
 srcpkgs/mypaint/template | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index 75bbd965d7e..e96fe9789af 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,19 +1,29 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=1.2.1
-revision=5
+version=1.2.2
+revision=1
+_sversion=beta.0
+_libcommit=f6278c97aa5af443e30069099c6461b056cdfe63
+archs="x86_64* i686*"
+wrksrc="${pkgname}-${version}-${_sversion}"
+pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="scons swig pkg-config"
 makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel
  lcms2-devel gtk+3-devel python-gobject-devel"
-depends="librsvg python-numpy python-gobject"
-pycompile_dirs="/usr/share/mypaint"
+depends="librsvg python-numpy python-gobject hicolor-icon-theme"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
-distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7
+distfiles="https://github.com/mypaint/mypaint/archive/v${version}-${_sversion}.tar.gz
+ https://github.com/mypaint/libmypaint/archive/${_libcommit}.tar.gz"
+checksum="c13130f9675787c2f51f38c03ca206aa80984e7673f674569caf3a06e503db08
+ bb9579d4d2d2a59b2343aa021887091845e0e8a2ff115312d87b9d975210b263"
 
+post_extract() {
+	rm -rf "${wrksrc}/brushlib"
+	mv "${XBPS_BUILDDIR}/libmypaint-${_libcommit}" "${wrksrc}/brushlib"
+}
 do_build() {
 	scons ${makejobs} enable_openmp=1
 }
@@ -23,4 +33,6 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/include
 	rm -f ${DESTDIR}/usr/lib/*.a
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
+	# Fix SVG icons
+	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 }

Re: [PR PATCH] [Updated] mypaint: update to 1.2.2

[voidlinux-github]

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

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

https://github.com/teh-jazzman/void-packages mypaint
https://github.com/void-linux/void-packages/pull/17970

mypaint: update to 1.2.2
SWIG compatibility update and SVG icon fixes

Fixes #17841

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

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

From ae5345ccee41fc16758ebeb47ba67175237b7139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Wed, 1 Jan 2020 15:50:06 +0100
Subject: [PATCH] mypaint: update to 1.2.2

---
 srcpkgs/mypaint/template | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index 75bbd965d7e..eca966e9b5f 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,26 +1,36 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=1.2.1
-revision=5
+version=1.2.2
+revision=1
+_sversion=beta.0
+_libcommit=f6278c97aa5af443e30069099c6461b056cdfe63
+wrksrc="${pkgname}-${version}-${_sversion}"
+build_style=scons
+make_build_args="enable_openmp=1 numpy_include=${XBPS_CROSS_BASE}/usr/lib/python2.7/site-packages/numpy/core/include/"
+pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="scons swig pkg-config"
 makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel
  lcms2-devel gtk+3-devel python-gobject-devel"
-depends="librsvg python-numpy python-gobject"
-pycompile_dirs="/usr/share/mypaint"
+depends="librsvg python-numpy python-gobject hicolor-icon-theme"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
-distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7
+distfiles="https://github.com/mypaint/mypaint/archive/v${version}-${_sversion}.tar.gz
+ https://github.com/mypaint/libmypaint/archive/${_libcommit}.tar.gz"
+checksum="c13130f9675787c2f51f38c03ca206aa80984e7673f674569caf3a06e503db08
+ bb9579d4d2d2a59b2343aa021887091845e0e8a2ff115312d87b9d975210b263"
 
-do_build() {
-	scons ${makejobs} enable_openmp=1
+post_extract() {
+	rm -rf "${wrksrc}/brushlib"
+	mv "${XBPS_BUILDDIR}/libmypaint-${_libcommit}" "${wrksrc}/brushlib"
 }
 do_install() {
-	scons prefix=${DESTDIR}/usr enable_openmp=1 install
+	scons prefix=${DESTDIR}/usr ${make_build_args} install
 	# Remove development files
 	rm -rf ${DESTDIR}/usr/include
 	rm -f ${DESTDIR}/usr/lib/*.a
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
+	# Fix SVG icons
+	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 }

Re: [PR PATCH] [Merged]: mypaint: update to 1.2.2

[voidlinux-github]

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

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

mypaint: update to 1.2.2
https://github.com/void-linux/void-packages/pull/17970

Description:
SWIG compatibility update and SVG icon fixes

Fixes #17841