python3-cairo: Rebuild against Python 3.4
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
parent
33619ff612
commit
d0873e09f0
|
@ -0,0 +1,11 @@
|
||||||
|
--- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig 2014-05-12 12:36:46.776004776 +0200
|
||||||
|
+++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py 2014-05-12 12:36:53.994995779 +0200
|
||||||
|
@@ -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:
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up pycairo-1.10.0/test/examples_test.py~ pycairo-1.10.0/test/examples_test.py
|
||||||
|
--- pycairo-1.10.0/test/examples_test.py~ 2010-05-29 08:28:35.000000000 +0300
|
||||||
|
+++ pycairo-1.10.0/test/examples_test.py 2013-12-20 22:53:07.806217741 +0200
|
||||||
|
@@ -14,7 +14,7 @@ def test_snippets():
|
||||||
|
examples/cairo_snippets/snippets/
|
||||||
|
'''
|
||||||
|
def doSnippets(name):
|
||||||
|
- retcode = subprocess.call('python %s -s' % name, shell=True)
|
||||||
|
+ retcode = subprocess.call('python3 %s -s' % name, shell=True)
|
||||||
|
assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
|
||||||
|
|
||||||
|
os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
name = python3-cairo
|
name = python3-cairo
|
||||||
version = 1.10.0
|
version = 1.10.0
|
||||||
release = 1
|
release = 2
|
||||||
|
|
||||||
groups = Development/Tools
|
groups = Development/Tools
|
||||||
url = http://cairographics.org/pycairo
|
url = http://cairographics.org/pycairo
|
||||||
|
@ -25,7 +25,21 @@ build
|
||||||
requires
|
requires
|
||||||
cairo-devel
|
cairo-devel
|
||||||
pkg-config
|
pkg-config
|
||||||
python3-devel
|
python3-devel >= 3.4
|
||||||
|
end
|
||||||
|
|
||||||
|
prepare
|
||||||
|
# Extract source tarball.
|
||||||
|
%{MACRO_EXTRACT_TARBALL}
|
||||||
|
|
||||||
|
# Ensure that ./waf has created the cached unpacked version
|
||||||
|
# of the wafadmin source tree.
|
||||||
|
# This will be created to a subdirectory like
|
||||||
|
# .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
|
||||||
|
python3 ./waf --version
|
||||||
|
|
||||||
|
# Apply all patches.
|
||||||
|
%{MACRO_PATCHES}
|
||||||
end
|
end
|
||||||
|
|
||||||
build
|
build
|
||||||
|
|
Loading…
Reference in New Issue