diff options
author | Ross Burton <ross.burton@intel.com> | 2014-12-19 19:52:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 08:14:25 +0000 |
commit | 9e64b6d96c0434d91150c3b4829046e6d70b0e00 (patch) | |
tree | 7f47b0697fcff0c2244841308df33f7d6ce73159 /meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch | |
parent | db8bf52277c1596e0703cee21ff52cad04365eb7 (diff) | |
download | poky-9e64b6d96c0434d91150c3b4829046e6d70b0e00.tar.gz |
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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch | 31 |
1 files changed, 0 insertions, 31 deletions
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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: gtk/gtkcellrenderer.c | ||
4 | =================================================================== | ||
5 | --- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800 | ||
6 | +++ gtk/gtkcellrenderer.c 2010-06-22 17:21:25.000000000 +0800 | ||
7 | @@ -566,6 +566,7 @@ | ||
8 | |||
9 | if (cell->cell_background_set && !selected) | ||
10 | { | ||
11 | +#ifdef USE_CAIRO_INTERNALLY | ||
12 | cairo_t *cr = gdk_cairo_create (window); | ||
13 | |||
14 | gdk_cairo_rectangle (cr, background_area); | ||
15 | @@ -573,6 +574,16 @@ | ||
16 | cairo_fill (cr); | ||
17 | |||
18 | cairo_destroy (cr); | ||
19 | +#else | ||
20 | + GdkGC *gc; | ||
21 | + | ||
22 | + gc = gdk_gc_new (window); | ||
23 | + gdk_gc_set_rgb_fg_color (gc, &priv->cell_background); | ||
24 | + gdk_draw_rectangle (window, gc, TRUE, | ||
25 | + background_area->x, background_area->y, | ||
26 | + background_area->width, background_area->height); | ||
27 | + g_object_unref (gc); | ||
28 | +#endif | ||
29 | } | ||
30 | |||
31 | GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, | ||