[oe-commits] org.oe.dev python-pygtk2 2.10.0 add patch to make it cross-build

[mickeyl commit]

python-pygtk2 2.10.0 add patch to make it cross-build

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 12ff563eb00759b6cae9ecfc5c1400f246dcd533
ViewMTN: http://monotone.openembedded.org/revision.psp?id=12ff563eb00759b6cae9ecfc5c1400f246dcd533
Files:
1
packages/python/python-pygtk2/fix-gtkunixprint.patch
packages/python/python-pygobject_2.12.2.bb
packages/python/python-pygtk2_2.10.0.bb
Diffs:

#
# mt diff -ra945a3985aa9ce0c1df85e5cb4e78a362162b68d -r12ff563eb00759b6cae9ecfc5c1400f246dcd533
#
# 
# 
# add_file "packages/python/python-pygtk2/fix-gtkunixprint.patch"
#  content [463f9b4d2ab0f260fe8b420c96d1a1658ef93520]
# 
# patch "packages/python/python-pygobject_2.12.2.bb"
#  from [a160db58bb7bbdd8c09745904555275d1293b80b]
#    to [20091717bf90c3bd85fa4efaf169f4c5fa3b6d7f]
# 
# patch "packages/python/python-pygtk2_2.10.0.bb"
#  from [37067f2c1b7fbce89cfbe4929395f900f4342eac]
#    to [02c1e9327a5f8fcecbed85043b1a0039bd8da2a0]
# 
============================================================
--- packages/python/python-pygtk2/fix-gtkunixprint.patch	463f9b4d2ab0f260fe8b420c96d1a1658ef93520
+++ packages/python/python-pygtk2/fix-gtkunixprint.patch	463f9b4d2ab0f260fe8b420c96d1a1658ef93520
@@ -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
============================================================
--- packages/python/python-pygobject_2.12.2.bb	a160db58bb7bbdd8c09745904555275d1293b80b
+++ packages/python/python-pygobject_2.12.2.bb	20091717bf90c3bd85fa4efaf169f4c5fa3b6d7f
@@ -1,7 +1,8 @@ LICENSE = "LGPL"
 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/
 }
============================================================
--- packages/python/python-pygtk2_2.10.0.bb	37067f2c1b7fbce89cfbe4929395f900f4342eac
+++ packages/python/python-pygtk2_2.10.0.bb	02c1e9327a5f8fcecbed85043b1a0039bd8da2a0
@@ -1,13 +1,14 @@ SECTION = "devel/python"
 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}"