summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-09-05 10:00:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 18:05:42 +0100
commita5ee5fe90a0e417e38a0d90639f655b28378fe3c (patch)
tree75948755ee7848f8d75a2142927fcf975d54440e
parent1d4861923db9674ff5b83fcd0755423bb1ccfd22 (diff)
downloadpoky-a5ee5fe90a0e417e38a0d90639f655b28378fe3c.tar.gz
poky-a5ee5fe90a0e417e38a0d90639f655b28378fe3c.tar.bz2
poky-a5ee5fe90a0e417e38a0d90639f655b28378fe3c.zip
python-pygtk: Upgrade to 2.24
This is needed for the build appliance and Hob also (From OE-Core rev: e177b0dcf9b39130d4a2a4dd1ea5af72b3cc87a3) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch14
-rw-r--r--meta/recipes-devtools/python/python-pygtk_2.24.0.bb (renamed from meta/recipes-devtools/python/python-pygtk_2.17.0.bb)8
2 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
index 6d2f64b414..16c0e8e770 100644
--- a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
+++ b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
@@ -1,17 +1,19 @@
Upstream-Status: Inappropriate [configuration]
-Index: pygtk-2.10.0/gtk/gtkunixprint.override
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: pygtk-2.24.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
+--- pygtk-2.24.0.orig/gtk/gtkunixprint.override
++++ pygtk-2.24.0/gtk/gtkunixprint.override
+@@ -102,11 +102,6 @@ _wrap_gtk_print_job_get_surface(PyGObjec
if (pyg_error_check(&error))
return NULL;
-#if PYCAIRO_VERSION_HEX >= 0x1010600
- return PycairoSurface_FromSurface(surface, NULL);
+- return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL);
-#else
-- return PycairoSurface_FromSurface(surface, NULL, NULL);
+- return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL, NULL);
-#endif
}
%%
diff --git a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
index 603ec5b6fe..20d54a33e1 100644
--- a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
+++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
@@ -7,16 +7,16 @@ PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
-PR = "ml10"
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/${SRCNAME}-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \
file://fix-gtkunixprint.patch \
file://prevent_to_get_display_during_import.patch \
file://nodocs.patch \
file://acinclude.m4"
-SRC_URI[md5sum] = "43d704343d7ca04a6e4ddd4fa73a3c55"
-SRC_URI[sha256sum] = "6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400"
+SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49"
+SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912"
+
S = "${WORKDIR}/${SRCNAME}-${PV}"
EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../"