On Sun, 25 May 2014 23:00:35 +0200
Landry Breuil <[email protected]> wrote:
> On Sun, May 25, 2014 at 09:19:11PM +0100, Stuart Henderson wrote:
> > On 2014/05/25 22:08, frantisek holop wrote:
> > >
> > > what is the timeline of flipping py3 flavour
> > > over to python3.4?
> >
> > A bulk build was done with iirc minimal fallout .. but if it's going in
> > this release cycle, it needs to be sooner rather than later.
>
> Yes, py3-cairo was failing, iirc rpointel@ is looking into this.
Hi,
this is the diff to build py3-cairo with Python 3.4.
This patch works fine with Python 3.3 too.
Are you ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/py3-cairo/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 30 May 2013 13:09:21 -0000 1.4
+++ Makefile 26 May 2014 04:55:03 -0000
@@ -33,6 +33,12 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
TEST_DEPENDS=devel/py-test${MODPY_FLAVOR}
+# du to the fact that waf extract embedded bzip2 tarball unpacked at runtime.
+# we need to call waf to create files before patching files.
+post-extract:
+ cd ${WRKSRC} && ${MODPY_BIN} ./waf --help 1>&2 > /dev/null
+ cd ${WRKSRC} && ln -s .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6 waf3
+
do-configure:
cd ${WRKSRC} && env PYTHON=${MODPY_BIN} \
LDFLAGS="$$(python${MODPY_VERSION}-config --libs)" \
Index: patches/patch-_waf3-waflib_Tools_python_py
===================================================================
RCS file: patches/patch-_waf3-waflib_Tools_python_py
diff -N patches/patch-_waf3-waflib_Tools_python_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-_waf3-waflib_Tools_python_py 26 May 2014 04:55:03 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- waf3/waflib/Tools/python.py.orig Wed Mar 30 08:17:51 2011
++++ waf3/waflib/Tools/python.py Sun May 18 09:48:35 2014
+@@ -169,7 +169,7 @@ def check_python_headers(conf):
+
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:
+@@ -278,4 +278,4 @@ feature('pyembed')(init_pyembed)
+ conf(get_python_variables)
+ conf(check_python_headers)
+ conf(check_python_version)
+-conf(check_python_module)
+\ No newline at end of file
++conf(check_python_module)
