merge of '425d05a68460efe35fd3aa32789666be49ecd3cf'

     and 'c1c58152e12d208c30b3e36b988116eaf94ba68e'

7 files changed, 59 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f924e32644..e2efb0ed28 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23,6 +23,12 @@ Machines:   h3600, h5400
 Interests:  Kernels, Porting, Distro refinement
 Recipes:    at76c503a, dropbear, handhelds-sa, handhelds-pxa
 
+Person:     Holger Hans Peter Freyther
+Mail:       zecke@selfish.org
+Website:    http://www.openembedded.org/~zecke
+Interests:  icecream, insanity, QA
+Recipes:    sqlite3, xine
+
 Person:     Jamie Lenehan
 Mail:       lenehan@twibble.org
 Website:    http://twibble.org/
@@ -104,8 +110,3 @@ Recipes:    lcdproc, libol, mailx, mysql, musicpd, openntpd, qc-usb
 Recipes:    radlib, scsi-idle, rng-tools, slugos-init, syslog-ng
 Recipes:    vsftpd, zd1211, wpa-supplicant
 
-Person:     Holger Hans Peter Freyther
-Mail:       zecke@selfish.org
-Website:    http://www.openembedded.org/~zecke
-Interests:  icecream, insanity, QA
-Recipes:    sqlite3, xine
diff --git a/packages/python/python-pycairo/.mtn2git_empty b/packages/python/python-pycairo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pycairo/.mtn2git_empty
diff --git a/packages/python/python-pycairo/fix-pkgconfig-dir.patch b/packages/python/python-pycairo/fix-pkgconfig-dir.patch
new file mode 100644
index 0000000000..15f4b3d786
--- /dev/null
+++ b/packages/python/python-pycairo/fix-pkgconfig-dir.patch
@@ -0,0 +1,13 @@
+Index: pycairo-1.2.2/setup.py
+===================================================================
+--- pycairo-1.2.2.orig/setup.py
++++ pycairo-1.2.2/setup.py
+@@ -57,7 +57,7 @@ dic.setup(
+     )
+ 
+ pkgconfig_dir  = os.path.join (sys.prefix, 'lib', 'pkgconfig')
+-pkgconfig_file = os.path.join (pkgconfig_dir, 'pycairo.pc')
++pkgconfig_file = os.path.join ('.', 'pycairo.pc')
+ print 'creating %s' % pkgconfig_file
+ fo = file (pkgconfig_file, 'w')
+ fo.write ("""\
diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.2.2.bb
new file mode 100644
index 0000000000..548d972c50
--- /dev/null
+++ b/packages/python/python-pycairo_1.2.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Python Bindings for the Cairo canvas library"
+SECTION = "python-devel"
+HOMEPAGE = "http://cairographics.org/pycairo"
+LICENSE = "LGPL MPL"
+DEPENDS = "cairo"
+
+SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
+           file://fix-pkgconfig-dir.patch;patch=1"
+S = "${WORKDIR}/pycairo-${PV}"
+
+inherit distutils
+
+do_stage() {
+	install -d ${STAGING_INCDIR}
+	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
+}
+
diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb
index b184599ee0..a79032f301 100644
--- a/packages/python/python-pygobject_2.12.2.bb
+++ b/packages/python/python-pygobject_2.12.2.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Python GObject bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
-PR = "ml0"
+DEPENDS = "python-pygobject-native"
+PR = "ml2"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2"
 S = "${WORKDIR}/pygobject-${PV}"
@@ -12,4 +13,6 @@ do_stage() {
 	autotools_stage_all
 	install -d ${STAGING_LIBDIR}/../share/pygobject/
 	cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
+	install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+	cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
 }
diff --git a/packages/python/python-pygtk2/fix-gtkunixprint.patch b/packages/python/python-pygtk2/fix-gtkunixprint.patch
new file mode 100644
index 0000000000..dca19ce5ed
--- /dev/null
+++ b/packages/python/python-pygtk2/fix-gtkunixprint.patch
@@ -0,0 +1,16 @@
+Index: pygtk-2.10.0/gtk/gtkunixprint.override
+===================================================================
+--- pygtk-2.10.0.orig/gtk/gtkunixprint.override
++++ pygtk-2.10.0/gtk/gtkunixprint.override
+@@ -105,11 +105,7 @@ _wrap_gtk_print_job_get_surface(PyGObjec
+     if (pyg_error_check(&error))
+         return NULL;
+ 
+-#if PYCAIRO_VERSION_HEX >= 0x1010600
+     return PycairoSurface_FromSurface(surface, NULL);
+-#else
+-    return PycairoSurface_FromSurface(surface, NULL, NULL);
+-#endif
+ }
+ %%
+ override gtk_print_job_send kwargs
diff --git a/packages/python/python-pygtk2_2.10.0.bb b/packages/python/python-pygtk2_2.10.0.bb
index 3f52051c17..1af24b410d 100644
--- a/packages/python/python-pygtk2_2.10.0.bb
+++ b/packages/python/python-pygtk2_2.10.0.bb
@@ -1,13 +1,14 @@
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pygobject-native"
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "r0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
+           file://fix-gtkunixprint.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"