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

[teh-jazzman <teh-jazzman@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 322 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/20439

mypaint: update to 2.0.0


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

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

From 3864e44b1676ffc8be48acb37267d3157fecf6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Sun, 29 Mar 2020 12:28:38 +0200
Subject: [PATCH] mypaint: update to 2.0.0

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 ++++++++
 srcpkgs/mypaint/template                  | 32 ++++++-----------------
 2 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
new file mode 100644
index 00000000000..9454203a493
--- /dev/null
+++ b/srcpkgs/mypaint/patches/releaseinfo.patch
@@ -0,0 +1,11 @@
+--- 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 2060f5cd658..f478f7b6c58 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,36 +1,20 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=1.2.2
+version=2.0.0
 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/"
+build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
-hostmakedepends="scons swig pkg-config gettext"
-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 hicolor-icon-theme"
+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"
+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"
-distfiles="https://github.com/mypaint/mypaint/archive/v${version}-${_sversion}.tar.gz
- https://github.com/mypaint/libmypaint/archive/${_libcommit}.tar.gz"
-checksum="c13130f9675787c2f51f38c03ca206aa80984e7673f674569caf3a06e503db08
- bb9579d4d2d2a59b2343aa021887091845e0e8a2ff115312d87b9d975210b263"
+distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
+checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
 
-post_extract() {
-	rm -rf "${wrksrc}/brushlib"
-	mv "${XBPS_BUILDDIR}/libmypaint-${_libcommit}" "${wrksrc}/brushlib"
-}
-do_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
+post_install() {
 	# Fix SVG icons
 	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 }