snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

mypaint: rebuild due to python-numpy-devel merge 

Add patch to make mypaint honor compiler flags (via Gentoo).
This commit is contained in:
Alessio Sergi 2015-11-20 09:07:08 +01:00
parent 97d641e04d
commit 3a67e986d9
2 changed files with 64 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
srcpkgs/mypaint/patches/mypaint-1.1.0-build-env-vars.patch Normal file
View File

@ -0,0 +1,53 @@
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

21
srcpkgs/mypaint/template
View File

@ -1,19 +1,20 @@
# Template file for 'mypaint'
pkgname="mypaint"
version="1.1.0"
revision=4
pkgname=mypaint
version=1.1.0
revision=5
hostmakedepends="scons swig pkg-config"
makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel
lcms2-devel gtk+-devel python-gobject2-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.bz2"
checksum="780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838"
depends="pygtk python-numpy"
makedepends="libgomp-devel json-c-devel python-numpy-devel libglib-devel libpng-devel lcms2-devel gtk+-devel python-gobject2-devel"
hostmakedepends="scons swig pkg-config"
pycompile_dirs="/usr/share/mypaint"
distfiles="http://download.gna.org/mypaint/mypaint-${version}.tar.xz"
checksum=58fd90b08fa3142b6dddc2a656c0e406fc3ebcf9086b84e83815780ab7698036
post_extract() {
pre_build() {
sed -i "s/'json'/'json-c'/g" brushlib/SConscript
}
do_build() {