From d0873e09f08dfc3c33a3f5d2c28a54c83027a936 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 17 Oct 2015 21:22:42 +0200 Subject: [PATCH] python3-cairo: Rebuild against Python 3.4 Signed-off-by: Michael Tremer --- ...af-use-python-config-as-shell-script.patch0 | 11 +++++++++++ .../patches/pycairo-1.10.0-test-python3.patch | 12 ++++++++++++ python3-cairo/python3-cairo.nm | 18 ++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 create mode 100644 python3-cairo/patches/pycairo-1.10.0-test-python3.patch diff --git a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 new file mode 100644 index 000000000..b8cd8566f --- /dev/null +++ b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 @@ -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: diff --git a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch new file mode 100644 index 000000000..32e398f7e --- /dev/null +++ b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch @@ -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', diff --git a/python3-cairo/python3-cairo.nm b/python3-cairo/python3-cairo.nm index c8f04b1fe..a360e7ace 100644 --- a/python3-cairo/python3-cairo.nm +++ b/python3-cairo/python3-cairo.nm @@ -5,7 +5,7 @@ name = python3-cairo version = 1.10.0 -release = 1 +release = 2 groups = Development/Tools url = http://cairographics.org/pycairo @@ -25,7 +25,21 @@ build requires cairo-devel 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 build