summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-17 12:35:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 13:06:41 +0100
commit35d9684f8dcee8194ad43cb342df21649683d8de (patch)
treeade464141dc00a9392c2fe5d11833e9df97c807a /meta/recipes-gnome/gtk+
parent6e4bd6879e8899479f1ce1ef956f08ed31b90844 (diff)
downloadpoky-35d9684f8dcee8194ad43cb342df21649683d8de.tar.gz
gtk+ remove 2.16.6
(From OE-Core rev: a11630f4eb667d78260cec09d2bafe621bad04e1) 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+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch33
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch34
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff99
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch105
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch33
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch12
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch21
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff102
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch18
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.16.6.bb49
10 files changed, 0 insertions, 506 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
deleted file mode 100644
index 7d39a77775..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001
2From: Rob Bradford <rob@linux.intel.com>
3Date: Thu, 4 Jun 2009 15:43:20 +0100
4Subject: [PATCH] =?utf-8?q?bgo#584832=20=E2=80=93=20Duplicate=20the=20exec=20string=20returned=20by=20gtk=5Frecent=5Finfo=5Fget=5Fapplication=5Finfo?=
5MIME-Version: 1.0
6Content-Type: text/plain; charset=utf-8
7Content-Transfer-Encoding: 8bit
8
9This function states that the caller is responsible for freeing the string
10passed returned by reference. Unfortunately if you do this you get a crash
11since the internal value is returned without being duplicated.
12---
13 gtk/gtkrecentmanager.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16Upstream-Status: Pending
17
18diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
19index 317b3d5..d062572 100644
20--- a/gtk/gtkrecentmanager.c
21+++ b/gtk/gtkrecentmanager.c
22@@ -1764,7 +1764,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo *info,
23 }
24
25 if (app_exec)
26- *app_exec = ai->exec;
27+ *app_exec = g_strdup (ai->exec);
28
29 if (count)
30 *count = ai->count;
31--
321.6.3.1
33
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
deleted file mode 100644
index 2524b99465..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3Index: gtk/gtkcellrenderer.c
4===================================================================
5RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
6retrieving revision 1.55
7diff -u -r1.55 gtkcellrenderer.c
8--- gtk/gtkcellrenderer.c 14 May 2006 04:25:28 -0000 1.55
9+++ gtk/gtkcellrenderer.c 30 Jun 2006 10:57:43 -0000
10@@ -551,6 +551,7 @@
11
12 if (cell->cell_background_set && !selected)
13 {
14+#ifdef USE_CAIRO_INTERNALLY
15 cairo_t *cr = gdk_cairo_create (window);
16
17 gdk_cairo_rectangle (cr, background_area);
18@@ -558,6 +559,16 @@
19 cairo_fill (cr);
20
21 cairo_destroy (cr);
22+#else
23+ GdkGC *gc;
24+
25+ gc = gdk_gc_new (window);
26+ gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
27+ gdk_draw_rectangle (window, gc, TRUE,
28+ background_area->x, background_area->y,
29+ background_area->width, background_area->height);
30+ g_object_unref (gc);
31+#endif
32 }
33
34 GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
deleted file mode 100644
index c777b8e8e3..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
+++ /dev/null
@@ -1,99 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: gtk+-2.14.2/configure.in
4===================================================================
5--- gtk+-2.14.2.orig/configure.in 2008-09-23 16:32:42.000000000 +0100
6+++ gtk+-2.14.2/configure.in 2008-09-23 16:37:13.000000000 +0100
7@@ -1025,48 +1025,50 @@
8 # check one of the variables here
9 AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
10
11-if test x$gio_can_sniff = x; then
12- AC_MSG_CHECKING([if gio can sniff png])
13- gtk_save_LIBS="$LIBS"
14- gtk_save_CFLAGS="$CFLAGS"
15- LIBS="`$PKG_CONFIG --libs gio-2.0`"
16- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
17- AC_RUN_IFELSE([AC_LANG_SOURCE([[
18- #include <gio/gio.h>
19- static const gsize data_size = 159;
20- static const guint8 data[] =
21- {
22- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
23- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
24- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
25- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
26- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
27- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
28- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
29- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
30- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
31- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
32- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
33- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
34- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
35- 0x42, 0x60, 0x82
36- };
37- int
38- main (int argc, char **argv)
39- {
40- char *content_type;
41- char *image_png;
42- content_type = g_content_type_guess (NULL, data, data_size, NULL);
43- image_png = g_content_type_from_mime_type ("image/png");
44- return !!strcmp (content_type, image_png);
45- }]])],
46- [gio_can_sniff=yes
47- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
48- [gio_can_sniff=no])
49- AC_MSG_RESULT($gio_can_sniff)
50- LIBS="$gtk_save_LIBS"
51- CFLAGS="$gtk_save_CFLAGS"
52-fi
53+# Disabled due to cross-compile
54+#if test x$gio_can_sniff = x; then
55+# AC_MSG_CHECKING([if gio can sniff png])
56+# gtk_save_LIBS="$LIBS"
57+# gtk_save_CFLAGS="$CFLAGS"
58+# LIBS="`$PKG_CONFIG --libs gio-2.0`"
59+# CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
60+# AC_RUN_IFELSE([AC_LANG_SOURCE([[
61+# #include <gio/gio.h>
62+# static const gsize data_size = 159;
63+# static const guint8 data[] =
64+# {
65+# 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
66+# 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
67+# 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
68+# 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
69+# 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
70+# 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
71+# 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
72+# 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
73+# 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
74+# 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
75+# 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
76+# 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
77+# 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
78+# 0x42, 0x60, 0x82
79+# };
80+# int
81+# main (int argc, char **argv)
82+# {
83+# char *content_type;
84+# char *image_png;
85+# content_type = g_content_type_guess (NULL, data, data_size, NULL);
86+# image_png = g_content_type_from_mime_type ("image/png");
87+# return !!strcmp (content_type, image_png);
88+# }]])],
89+# [gio_can_sniff=yes
90+# [gio_can_sniff=no])
91+# AC_MSG_RESULT($gio_can_sniff)
92+# LIBS="$gtk_save_LIBS"
93+# CFLAGS="$gtk_save_CFLAGS"
94+#fi
95+
96+AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
97
98 #
99 # Allow building some or all immodules included
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
deleted file mode 100644
index 3083b77830..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
+++ /dev/null
@@ -1,105 +0,0 @@
1Upstream-Status: Pending
2
3Index: gtk/gtkentry.c
4===================================================================
5RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
6retrieving revision 1.317
7diff -u -r1.317 gtkentry.c
8--- gtk/gtkentry.c 29 Jun 2006 09:18:05 -0000 1.317
9+++ gtk/gtkentry.c 2 Jul 2006 14:14:24 -0000
10@@ -3337,7 +3337,9 @@
11 if (GTK_WIDGET_DRAWABLE (entry))
12 {
13 PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
14+#ifdef USE_CAIRO_INTERNALLY
15 cairo_t *cr;
16+#endif
17 gint x, y;
18 gint start_pos, end_pos;
19
20@@ -3345,23 +3347,35 @@
21
22 get_layout_position (entry, &x, &y);
23
24+#ifdef USE_CAIRO_INTERNALLY
25 cr = gdk_cairo_create (entry->text_area);
26
27 cairo_move_to (cr, x, y);
28 gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
29 pango_cairo_show_layout (cr, layout);
30+#else
31+ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state],
32+ x, y,
33+ layout);
34+#endif
35
36 if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
37 {
38 gint *ranges;
39 gint n_ranges, i;
40 PangoRectangle logical_rect;
41- GdkColor *selection_color, *text_color;
42 GtkBorder inner_border;
43+#ifdef USE_CAIRO_INTERNALLY
44+ GdkColor *selection_color, *text_color;
45+#else
46+ GdkGC *selection_gc, *text_gc;
47+ GdkRegion *clip_region;
48+#endif
49
50 pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
51 gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
52
53+#ifdef USE_CAIRO_INTERNALLY
54 if (GTK_WIDGET_HAS_FOCUS (entry))
55 {
56 selection_color = &widget->style->base [GTK_STATE_SELECTED];
57@@ -3390,11 +3404,46 @@
58 cairo_move_to (cr, x, y);
59 gdk_cairo_set_source_color (cr, text_color);
60 pango_cairo_show_layout (cr, layout);
61-
62+#else
63+ if (GTK_WIDGET_HAS_FOCUS (entry))
64+ {
65+ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED];
66+ text_gc = widget->style->text_gc [GTK_STATE_SELECTED];
67+ }
68+ else
69+ {
70+ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE];
71+ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE];
72+ }
73+
74+ clip_region = gdk_region_new ();
75+ for (i = 0; i < n_ranges; ++i)
76+ {
77+ GdkRectangle rect;
78+
79+ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i];
80+ rect.y = y;
81+ rect.width = ranges[2 * i + 1];
82+ rect.height = logical_rect.height;
83+
84+ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE,
85+ rect.x, rect.y, rect.width, rect.height);
86+
87+ gdk_region_union_with_rect (clip_region, &rect);
88+ }
89+
90+ gdk_gc_set_clip_region (text_gc, clip_region);
91+ gdk_draw_layout (entry->text_area, text_gc,
92+ x, y,
93+ layout);
94+ gdk_gc_set_clip_region (text_gc, NULL);
95+ gdk_region_destroy (clip_region);
96+#endif
97 g_free (ranges);
98 }
99-
100+#ifdef USE_CAIRO_INTERNALLY
101 cairo_destroy (cr);
102+#endif
103 }
104 }
105
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
deleted file mode 100644
index e5bbe730f4..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: gtk+-2.14.2/configure.in
4===================================================================
5--- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100
6+++ gtk+-2.14.2/configure.in 2008-09-23 15:53:51.000000000 +0100
7@@ -401,7 +401,7 @@
8 case $enable_explicit_deps in
9 auto)
10 export SED
11- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
12+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
13 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
14 enable_explicit_deps=yes
15 else
16@@ -759,7 +759,7 @@
17 dnl Now we check to see if our libtool supports shared lib deps
18 dnl (in a rather ugly way even)
19 if $dynworks; then
20- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
21+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
22 pixbuf_deplibs_check=`$pixbuf_libtool_config | \
23 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
24 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
25@@ -1893,7 +1893,7 @@
26 # We are using gmodule-no-export now, but I'm leaving the stripping
27 # code in place for now, since pango and atk still require gmodule.
28 export SED
29-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
30+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
31 if test -n "$export_dynamic"; then
32 GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
33 GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
deleted file mode 100644
index 67d4f74357..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100
4+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100
5@@ -1,6 +1,6 @@
6 ## Makefile.am for GTK+
7
8-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
9+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
10 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
11
12 # require automake 1.4
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
deleted file mode 100644
index f35884c13f..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100
4+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100
5@@ -1128,11 +1128,11 @@
6 ./gtk-update-icon-cache
7 endif
8
9-gtkbuiltincache.h: @REBUILD@ stamp-icons
10- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
11- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
12- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
13- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
14+#gtkbuiltincache.h: @REBUILD@ stamp-icons
15+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
16+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
17+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
18+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
19
20 EXTRA_DIST += \
21 $(STOCK_ICONS) \
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
deleted file mode 100644
index e1050bd560..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
+++ /dev/null
@@ -1,102 +0,0 @@
1Upstream-Status: Pending
2
3Index: gtk/gtkcellrenderertoggle.c
4===================================================================
5--- gtk/gtkcellrenderertoggle.c (revision 18523)
6+++ gtk/gtkcellrenderertoggle.c (working copy)
7@@ -71,6 +71,8 @@
8 PROP_INDICATOR_SIZE
9 };
10
11+/* This is a hard-coded default which promptly gets overridden by a size
12+ calculated from the font size. */
13 #define TOGGLE_WIDTH 13
14
15 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
16@@ -80,8 +82,9 @@
17 typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
18 struct _GtkCellRendererTogglePrivate
19 {
20- gint indicator_size;
21-
22+ gint indicator_size; /* This is the real size */
23+ gint override_size; /* This is the size set from the indicator-size property */
24+ GtkWidget *cached_widget;
25 guint inconsistent : 1;
26 };
27
28@@ -104,6 +107,7 @@
29 GTK_CELL_RENDERER (celltoggle)->ypad = 2;
30
31 priv->indicator_size = TOGGLE_WIDTH;
32+ priv->override_size = 0;
33 priv->inconsistent = FALSE;
34 }
35
36@@ -210,7 +214,7 @@
37 g_value_set_boolean (value, celltoggle->radio);
38 break;
39 case PROP_INDICATOR_SIZE:
40- g_value_set_int (value, priv->indicator_size);
41+ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size);
42 break;
43 default:
44 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
45@@ -245,7 +249,7 @@
46 celltoggle->radio = g_value_get_boolean (value);
47 break;
48 case PROP_INDICATOR_SIZE:
49- priv->indicator_size = g_value_get_int (value);
50+ priv->override_size = g_value_get_int (value);
51 break;
52 default:
53 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
54@@ -273,6 +277,27 @@
55 }
56
57 static void
58+on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
59+{
60+ GtkCellRendererTogglePrivate *priv = user_data;
61+ PangoContext *context;
62+ PangoFontMetrics *metrics;
63+ int height;
64+
65+ context = gtk_widget_get_pango_context (widget);
66+ metrics = pango_context_get_metrics (context,
67+ widget->style->font_desc,
68+ pango_context_get_language (context));
69+
70+ height = pango_font_metrics_get_ascent (metrics) +
71+ pango_font_metrics_get_descent (metrics);
72+
73+ pango_font_metrics_unref (metrics);
74+
75+ priv->indicator_size = PANGO_PIXELS (height * 0.85);
76+}
77+
78+static void
79 gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
80 GtkWidget *widget,
81 GdkRectangle *cell_area,
82@@ -287,6 +312,20 @@
83
84 priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
85
86+ if (priv->override_size) {
87+ priv->indicator_size = priv->override_size;
88+ } else if (priv->cached_widget != widget) {
89+ if (priv->cached_widget) {
90+ g_object_remove_weak_pointer (widget, &priv->cached_widget);
91+ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
92+ }
93+ priv->cached_widget = widget;
94+ g_object_add_weak_pointer (widget, &priv->cached_widget);
95+ g_signal_connect (widget, "style-set", on_widget_style_set, priv);
96+
97+ on_widget_style_set (widget, NULL, priv);
98+ }
99+
100 calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
101 calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
102
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
deleted file mode 100644
index 98d335363b..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Pending
2
3--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004
4+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
5@@ -2827,10 +2827,9 @@
6 {
7 GdkScreenX11 *screen = data;
8
9- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
10- return GDK_FILTER_REMOVE;
11- else
12- return GDK_FILTER_CONTINUE;
13+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
14+
15+ return GDK_FILTER_CONTINUE;
16 }
17
18 static void
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
deleted file mode 100644
index 0b989daa79..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ /dev/null
@@ -1,49 +0,0 @@
1require gtk+.inc
2
3PR = "r11"
4
5SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
6 file://xsettings.patch \
7 file://run-iconcache.patch \
8 file://hardcoded_libtool.patch \
9 file://no-demos.patch \
10 file://cellrenderer-cairo.patch;striplevel=0 \
11 file://toggle-font.diff;striplevel=0 \
12 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
13 file://disable-gio-png-sniff-test.diff \
14 "
15# TO MERGE
16# file://entry-cairo.patch;striplevel=0
17# file://filesystem-volumes.patch
18# file://filechooser-props.patch
19# file://filechooser-default.patch
20# file://filechooser-sizefix.patch
21# temporary
22# file://gtklabel-resize-patch
23# file://menu-deactivate.patch
24# file://combo-arrow-size.patch;striplevel=0
25
26
27
28EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups"
29
30LIBV = "2.10.0"
31
32PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
33
34python populate_packages_prepend () {
35 prologue = d.getVar("postinst_prologue", True)
36 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
37
38 gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
39 loaders_root = os.path.join(gtk_libdir, 'loaders')
40 immodules_root = os.path.join(gtk_libdir, 'immodules')
41 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
42
43 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
44 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
45 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
46
47 if (d.getVar('DEBIAN_NAMES', True)):
48 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
49}