diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-05-08 21:53:17 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-05-12 07:35:55 +0700 |
| commit | afa449ab6e1d28d5efc57068da630b29494a6b78 (patch) | |
| tree | 16e861afb12a229f7559f05428590355efa0a3c3 | |
| parent | a211de6abd838b51e9d7ce34e8636ec9a927c845 (diff) | |
| download | slackbuilds-afa449ab6e1d28d5efc57068da630b29494a6b78.tar.gz | |
python/py3cairo: Fixed build with Python 3.4.0.
Thanks to ml4711 who posted patches from LFS.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | python/py3cairo/py3cairo.SlackBuild | 9 | ||||
| -rw-r--r-- | python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch | 19 | ||||
| -rw-r--r-- | python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch | 20 |
3 files changed, 47 insertions, 1 deletions
diff --git a/python/py3cairo/py3cairo.SlackBuild b/python/py3cairo/py3cairo.SlackBuild index 8207ee2dd9..e18a71a2bc 100644 --- a/python/py3cairo/py3cairo.SlackBuild +++ b/python/py3cairo/py3cairo.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=py3cairo SRCNAM=pycairo VERSION=${VERSION:-1.10.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,6 +72,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/pycairo-1.10.0-waf_unpack-1.patch +wafdir=$(python3 ./waf unpack) +pushd $wafdir +patch -p1 < $CWD/pycairo-1.10.0-waf_python_3_4-1.patch +popd +unset wafdir + PYTHON="/usr/bin/python3" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch b/python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch new file mode 100644 index 0000000000..83f69bdeeb --- /dev/null +++ b/python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch @@ -0,0 +1,19 @@ +Submitted by: Wayne Blaszczyk (wblaszcz at bigpond dot net dot au) +Date: 2014-03-27 +Initial Package Version: 1.10.0 +Upstream Status: unknown +Origin: Gentoo +URL: https://bugs.gentoo.org/show_bug.cgi?id=504342 +Description: Fix build with Python-3.4 + +--- a/waflib/Tools/python.py ++++ b/waflib/Tools/python.py +@@ -169,7 +169,7 @@ + conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False) + includes=[] + if conf.env.PYTHON_CONFIG: +- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split(): ++ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split(): + if(incstr.startswith('-I')or incstr.startswith('/I')): + incstr=incstr[2:] + if incstr not in includes: diff --git a/python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch b/python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch new file mode 100644 index 0000000000..319dd2c13b --- /dev/null +++ b/python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch @@ -0,0 +1,20 @@ +Submitted by: Wayne Blaszczyk (wblaszcz at bigpond dot net dot au) +Date: 2014-03-27 +Initial Package Version: 1.10.0 +Upstream Status: unknown +Origin: Gentoo +URL: https://bugs.gentoo.org/show_bug.cgi?id=504342 +Description: Fix build with Python-3.4 + +--- a/waf ++++ b/waf +@@ -153,6 +153,9 @@ + return dir + + wafdir = find_lib() ++if sys.argv[1:] == ['unpack']: ++ print(wafdir) ++ exit() + sys.path.insert(0, wafdir) + from waflib.Tools.c_config import MACRO_TO_DESTOS + MACRO_TO_DESTOS['__POWERPC__'] = 'darwin' |