Gentoo Archives: gentoo-commits

From: "Ian Delaney (idella4)" <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/pycairo/files: pycairo-1.10.0-waf-unpack.patch pycairo-1.10.0-waf-py3_4.patch
Date: Wed, 21 May 2014 14:34:35
Message-Id: 20140521143431.C197A2004C@flycatcher.gentoo.org
1 idella4 14/05/21 14:34:31
2
3 Added: pycairo-1.10.0-waf-unpack.patch
4 pycairo-1.10.0-waf-py3_4.patch
5 Log:
6 drop py2.6 add py3.4, patches to fix configure failure under py3.4, patch courtesy of Hristo Venev via Bug #504342 (early March)
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
9
10 Revision Changes Path
11 1.1 dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch?rev=1.1&content-type=text/plain
15
16 Index: pycairo-1.10.0-waf-unpack.patch
17 ===================================================================
18 --- a/waf
19 +++ b/waf
20 @@ -153,6 +153,9 @@
21 return dir
22
23 wafdir = find_lib()
24 +if sys.argv[1:] == ['unpack']:
25 + print(wafdir)
26 + exit()
27 sys.path.insert(0, wafdir)
28 from waflib.Tools.c_config import MACRO_TO_DESTOS
29 MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
30
31
32
33 1.1 dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch?rev=1.1&content-type=text/plain
37
38 Index: pycairo-1.10.0-waf-py3_4.patch
39 ===================================================================
40 --- a/waflib/Tools/python.py
41 +++ b/waflib/Tools/python.py
42 @@ -169,7 +169,7 @@
43 conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
44 includes=[]
45 if conf.env.PYTHON_CONFIG:
46 - for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
47 + for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
48 if(incstr.startswith('-I')or incstr.startswith('/I')):
49 incstr=incstr[2:]
50 if incstr not in includes: