Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6559bd202a02fc99e9d9dd0c01b64b4c9cf8cf6a
commit 6559bd202a02fc99e9d9dd0c01b64b4c9cf8cf6a Author: Anthony Jorion <[email protected]> Date: Wed May 21 14:04:26 2014 +0200 python3-pycairo-1.10.0-4-x86_64 - Rebuild with python-3.0>=3.4.1 + Add patches to fix build + improve build() part diff --git a/source/xlib/python3-pycairo/FrugalBuild b/source/xlib/python3-pycairo/FrugalBuild index c76aca4..b3cabd2 100644 --- a/source/xlib/python3-pycairo/FrugalBuild +++ b/source/xlib/python3-pycairo/FrugalBuild @@ -15,13 +15,22 @@ groups=('xlib') archs=('i686' 'x86_64') options=('scriptlet') up2date="Flasttar $url/releases/" -source=($url/releases/$_F_archive_name-$pkgver.tar.bz2) -sha1sums=('b4283aa1cc9aafd12fd72ad371303a486da1d014') +source=($url/releases/$_F_archive_name-$pkgver.tar.bz2 \ + pycairo-1.10.0-waf_unpack-1.patch \ + pycairo-1.10.0-waf_python_3_4-1.patch) +sha1sums=('b4283aa1cc9aafd12fd72ad371303a486da1d014' \ + 'dd8d96dab2f491e0a2f66a7dde5a4f9014b1c365' \ + 'c69b00b85735b7ea59be2f548b4d88f95f36eac3') build() { - export PYTHON=python3 + export PYTHON=/usr/bin/python3 Fcd - ./waf configure --prefix=/usr -p || Fdie + patch -Np1 -i $Fsrcdir/pycairo-1.10.0-waf_unpack-1.patch || Fdie + wafdir=$(./waf unpack) || Fdie + cd $wafdir || Fdie + patch -Np1 -i $Fsrcdir/pycairo-1.10.0-waf_python_3_4-1.patch || Fdie + cd .. || Fdie + ./waf configure --prefix=/usr || Fdie ./waf build || Fdie ./waf install --destdir=$Fdestdir } diff --git a/source/xlib/python3-pycairo/pycairo-1.10.0-waf_python_3_4-1.patch b/source/xlib/python3-pycairo/pycairo-1.10.0-waf_python_3_4-1.patch new file mode 100644 index 0000000..83f69bd --- /dev/null +++ b/source/xlib/python3-pycairo/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/source/xlib/python3-pycairo/pycairo-1.10.0-waf_unpack-1.patch b/source/xlib/python3-pycairo/pycairo-1.10.0-waf_unpack-1.patch new file mode 100644 index 0000000..319dd2c --- /dev/null +++ b/source/xlib/python3-pycairo/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' _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
