Hello community, here is the log from the commit of package python3-cairo for openSUSE:Factory checked in at 2014-02-26 06:55:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-cairo (Old) and /work/SRC/openSUSE:Factory/.python3-cairo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-cairo" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-cairo/python3-cairo.changes 2012-11-25 13:18:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-cairo.new/python3-cairo.changes 2014-02-26 06:55:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 10 16:26:16 UTC 2014 - [email protected] + +- Add waf-py34.patch: patch waf to work correctly with python 3.4 + +------------------------------------------------------------------- New: ---- waf-py34.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-cairo.spec ++++++ --- /var/tmp/diff_new_pack.yg5Y72/_old 2014-02-26 06:55:46.000000000 +0100 +++ /var/tmp/diff_new_pack.yg5Y72/_new 2014-02-26 06:55:46.000000000 +0100 @@ -26,6 +26,7 @@ # FIXME: on update, check if we still need to manually remove the byte-code in %%install Url: http://www.cairographics.org/ Source: %{modname}-%{version}.tar.bz2 +Source1: waf-py34.patch BuildRequires: cairo-devel # Needed to have the modules for different hash algorithms; python3-devel only brings in python3-base BuildRequires: python3 @@ -51,7 +52,15 @@ %setup -q -n %{modname}-%{version} %build -PYTHON=python3 python3 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} +export PYTHON=python3 +# an extremely crude way to patch the bundled-in version of waf. sorry. +# first run waf to extract its library +python3 waf --help > /dev/null +# find and patch the file +find -path "*/Tools/python.py" -exec patch -i %{S:1} {} ";" +# continue with build + +python3 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} python3 ./waf build %install ++++++ waf-py34.patch ++++++ --- python.py.orig 2014-02-10 17:21:55.822478906 +0100 +++ python.py 2011-03-30 08:17:51.000000000 +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: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
