Merge pull request #3170 from Spencer-H/mypaint

mypaint: update to 1.2.0.

srcpkgs/mypaint/patches/mypaint-1.1.0-build-env-vars.patch

@@ -1,53 +0,0 @@
-From 516d184b5db8ebdd8b184ef871050c3ab3f03fdf Mon Sep 17 00:00:00 2001
-From: Andrew Chadwick <andrewc-git@piffle.org>
-Date: Sun, 21 Apr 2013 22:51:05 +0100
-Subject: [PATCH] SConstruct: support standard build environ vars
-
-Support the standard build environment vars CC, CXX, CFLAGS, CXXFLAGS,
-CPPFLAGS, and LDFLAGS everywhere.
-
-Partially addresses https://gna.org/bugs/?20754
----
- SConstruct |   19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git SConstruct SConstruct
-index 0b55da1..ef39b9e 100644
---- SConstruct
-+++ SConstruct
-@@ -1,6 +1,7 @@
- import os, sys
- from os.path import join, basename
- from SCons.Script.SConscript import SConsEnvironment
-+import SCons.Util
- 
- EnsureSConsVersion(1, 0)
- 
-@@ -45,6 +46,24 @@ print('using %r (use scons python_config=xxx to change)' % env['python_config'])
- if sys.platform == "win32":
-     # remove this mingw if trying VisualStudio
-     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
-+
-+# Respect some standard build environment stuff
-+if os.environ.has_key('CC'):
-+   env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+   env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('CPPFLAGS'):
-+   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+   env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+if "$CCFLAGS" in env['CXXCOM']:
-+   env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
-+
- opts.Update(env)
- 
- env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
--- 
-1.7.10.4
-

srcpkgs/mypaint/template

@@ -1,21 +1,24 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=1.1.0
+version=1.2.0
-revision=5
+revision=1
-hostmakedepends="scons swig pkg-config"
+hostmakedepends="unzip scons swig pkg-config"
 makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel
- lcms2-devel gtk+-devel python-gobject2-devel"
+ lcms2-devel gtk+3-devel python-gobject-devel"
 depends="pygtk python-numpy"
 pycompile_dirs="/usr/share/mypaint"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2"
 homepage="http://mypaint.intilinux.com"
-distfiles="http://download.gna.org/mypaint/mypaint-${version}.tar.xz"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}-beta.3.tar.gz"
-checksum=58fd90b08fa3142b6dddc2a656c0e406fc3ebcf9086b84e83815780ab7698036
+checksum=b5b97dce391f8e5766d591adb65ca9b3a497cb9c1043dc190529ae99b7462dc4
+wrksrc=${pkgname}-${version}-beta.3
 
 pre_build() {
-	sed -i "s/'json'/'json-c'/g" brushlib/SConscript
+	${XBPS_FETCH_CMD} https://github.com/mypaint/libmypaint/archive/master.zip
+	unzip master.zip
+	mv libmypaint-master/* brushlib/
 }
 do_build() {
 	scons ${makejobs} enable_openmp=1