Upgrade to pycairo-1.10.0 and pygobject-3.10.2

diff --git a/config/packages-list b/config/packages-list
index c57f2e9..040ed42 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -351,8 +351,8 @@ PROCMAIL="procmail-3.22"
 PROCPS="procps-3.2.8"
 PSMISC="psmisc-22.17"
 PTH="pth-2.0.7"
-PYCAIRO="py2cairo-1.10.0"
-PYGOBJECT="pygobject-2.28.6"
+PYCAIRO="pycairo-1.10.0"
+PYGOBJECT="pygobject-3.10.2"
 PYGTK="pygtk-2.24.0"
 PYTHON="Python-2.7.3"
 P11KIT="p11-kit-0.22.1"

diff --git a/stage5/patches/common/pycairo-1.10.0-waf_python_3_4-1.patch b/stage5/patches/common/pycairo-1.10.0-waf_python_3_4-1.patch
new file mode 100644 (file)
index 0000000..83f69bd
--- /dev/null
+++ b/stage5/patches/common/pycairo-1.10.0-waf_python_3_4-1.patch
@@ -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:

diff --git a/stage5/patches/common/pycairo-1.10.0-waf_unpack-1.patch b/stage5/patches/common/pycairo-1.10.0-waf_unpack-1.patch
new file mode 100644 (file)
index 0000000..319dd2c
--- /dev/null
+++ b/stage5/patches/common/pycairo-1.10.0-waf_unpack-1.patch
@@ -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'

diff --git a/stage5/pkg/py2cairo b/stage5/pkg/py2cairo
deleted file mode 100644 (file)
index e586303..0000000
--- a/stage5/pkg/py2cairo
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-hvconfig()
-{
-    cd ${SRC_DIR}
-    ./waf configure \
-        --prefix=/usr
-}
-
-hvbuild()
-{
-    ./waf build
-    ./waf install
-}

diff --git a/stage5/pkg/pycairo b/stage5/pkg/pycairo
new file mode 100644 (file)
index 0000000..e586303
--- /dev/null
+++ b/stage5/pkg/pycairo
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+hvconfig()
+{
+    cd ${SRC_DIR}
+    ./waf configure \
+        --prefix=/usr
+}
+
+hvbuild()
+{
+    ./waf build
+    ./waf install
+}