Author: fernando
Date: Thu Mar 27 10:36:28 2014
New Revision: 2860

Log:
Fix build of pycairo-1.10.0 with python-3.4. Thanks Wayne B.

Added:
   trunk/pycairo/
   trunk/pycairo/pycairo-1.10.0-waf_python_3_4-1.patch
   trunk/pycairo/pycairo-1.10.0-waf_unpack-1.patch

Added: trunk/pycairo/pycairo-1.10.0-waf_python_3_4-1.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/pycairo/pycairo-1.10.0-waf_python_3_4-1.patch Thu Mar 27 10:36:28 
2014        (r2860)
@@ -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:

Added: trunk/pycairo/pycairo-1.10.0-waf_unpack-1.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/pycairo/pycairo-1.10.0-waf_unpack-1.patch     Thu Mar 27 10:36:28 
2014        (r2860)
@@ -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'
-- 
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to