From 9e64b6d96c0434d91150c3b4829046e6d70b0e00 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 19 Dec 2014 19:52:36 +0000 Subject: gtk+: upgrade to 2.24.25 Remove patches that are no longer needed: * GtkButton-do-no-prelight: merged upstream * Duplicate-the-exec-string: upstream decided this behaviour is incorrect * cellrenderer-cairo: Cairo isn't the performance bottleneck it once was, drop * configure-nm: resolved upstrea * configurefix.patch: not applied * run-iconcache: not needed when building tarballs, and if gtk-update-icon-cache is needed at build time (e.g. user is customising default icon theme) then they can add a dependency on gtk-update-icon-cache-native. Also remove mention of patches that have been commented out for a long time. (From OE-Core rev: 9299b5d2e5f82cf0e3f66ca49dedbe2c8b18bb44) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../gtk+/gtk+-2.24.24/cellrenderer-cairo.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch (limited to 'meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch') diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch deleted file mode 100644 index ba893292d6..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Index: gtk/gtkcellrenderer.c -=================================================================== ---- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800 -+++ gtk/gtkcellrenderer.c 2010-06-22 17:21:25.000000000 +0800 -@@ -566,6 +566,7 @@ - - if (cell->cell_background_set && !selected) - { -+#ifdef USE_CAIRO_INTERNALLY - cairo_t *cr = gdk_cairo_create (window); - - gdk_cairo_rectangle (cr, background_area); -@@ -573,6 +574,16 @@ - cairo_fill (cr); - - cairo_destroy (cr); -+#else -+ GdkGC *gc; -+ -+ gc = gdk_gc_new (window); -+ gdk_gc_set_rgb_fg_color (gc, &priv->cell_background); -+ gdk_draw_rectangle (window, gc, TRUE, -+ background_area->x, background_area->y, -+ background_area->width, background_area->height); -+ g_object_unref (gc); -+#endif - } - - GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, -- cgit v1.2.3-54-g00ecf