diff options
| -rw-r--r-- | packages/python/python-pygobject_2.12.2.bb | 5 | ||||
| -rw-r--r-- | packages/python/python-pygtk2/fix-gtkunixprint.patch | 16 | ||||
| -rw-r--r-- | packages/python/python-pygtk2_2.10.0.bb | 5 |
3 files changed, 23 insertions, 3 deletions
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}" |