[oe-commits] Denis 'Gnutoo' Carikli : pygtk 2.10.4 : fix bug #44974 (gnome bugzilla)
git version control
git at git.openembedded.org
Sun Jan 24 10:39:18 UTC 2010
Module: openembedded.git
Branch: holger/staging-branch
Commit: 226acbc4e96be3543596d4a712d2acfb3148b8f5
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=226acbc4e96be3543596d4a712d2acfb3148b8f5
Author: Denis 'Gnutoo' Carikli <GNUtoo at no-log.org>
Date: Fri Jan 22 22:36:19 2010 +0100
pygtk 2.10.4 : fix bug #44974 (gnome bugzilla)
See https://bugzilla.gnome.org/show_bug.cgi?id=444974 for more details
I encountred this bug when trying to run an application, that made use
of the 2 screens of the bug device(see bug.conf in machines dir)
The patch is already in the trunk of pygtk,and so is already upstream
---
recipes/python/python-pygtk/gdk_display.patch | 46 +++++++++++++++++++++++++
recipes/python/python-pygtk_2.10.4.bb | 3 +-
2 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/recipes/python/python-pygtk/gdk_display.patch b/recipes/python/python-pygtk/gdk_display.patch
new file mode 100644
index 0000000..f0ddb8e
--- /dev/null
+++ b/recipes/python/python-pygtk/gdk_display.patch
@@ -0,0 +1,46 @@
+Index: gtk/gdk.override
+===================================================================
+--- gtk/gdk.override (revision 2816)
++++ gtk/gdk.override (working copy)
+@@ -922,6 +922,23 @@ _wrap_gdk_display_manager_list_displays(
+ return py_list;
+ }
+ %%
++override gdk_screen_new noargs
++static int
++_wrap_gdk_screen_new (PyGObject *self)
++{
++ self->obj = (GObject *)gdk_screen_get_default();
++ if (!self->obj) {
++ PyErr_SetString(PyExc_RuntimeError,
++ "could not get default display");
++ return -1;
++ }
++
++ g_object_ref(self->obj);
++
++ pygobject_register_wrapper((PyObject *)self);
++ return 0;
++}
++%%
+ override gdk_screen_list_visuals noargs
+ static PyObject *
+ _wrap_gdk_screen_list_visuals(PyGObject *self)
+Index: gtk/gdk-base.defs
+===================================================================
+--- gtk/gdk-base.defs (revision 2816)
++++ gtk/gdk-base.defs (working copy)
+@@ -3866,6 +3866,13 @@
+ (return-type "GdkScreen*")
+ )
+
++;; dummy, overridden to return gdk_screen_get_default()
++(define-function gdk_screen_new
++ (c-name "gdk_screen_new")
++ (return-type "GdkScreen*")
++ (is-constructor-of "GdkScreen")
++)
++
+ (define-method get_setting
+ (of-object "GdkScreen")
+ (c-name "gdk_screen_get_setting")
diff --git a/recipes/python/python-pygtk_2.10.4.bb b/recipes/python/python-pygtk_2.10.4.bb
index bdfebaf..81cb593 100644
--- a/recipes/python/python-pygtk_2.10.4.bb
+++ b/recipes/python/python-pygtk_2.10.4.bb
@@ -6,13 +6,14 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
LICENSE = "LGPL"
-PR = "ml11"
+PR = "ml12"
MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
file://fix-gtkunixprint.patch;patch=1 \
file://prevent_to_get_display_during_import.patch;patch=1 \
file://nodocs.patch;patch=1 \
+ file://gdk_display.patch;patch=1;pnum=0 \
file://acinclude.m4"
S = "${WORKDIR}/${SRCNAME}-${PV}"
More information about the Openembedded-commits
mailing list