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+ | |
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+')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch | 22 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 35 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/toggle-font.diff | 102 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/xsettings.patch | 20 |
4 files changed, 179 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch new file mode 100644 index 0000000000..74e479fd1b --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | There are issues building the gtk+ tutorial and faq documentation. | ||
2 | Since they were removed in gtk+ upstream and are superfluous in | ||
3 | embedded applications, just don't build them. | ||
4 | |||
5 | Thanks to Joshua Lock for suggesting this approach. | ||
6 | |||
7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am | ||
12 | --- gtk+-2.22.1.orig/docs/Makefile.am 2010-11-15 04:13:09.000000000 -0800 | ||
13 | +++ gtk+-2.22.1/docs/Makefile.am 2011-02-23 19:25:16.914815097 -0800 | ||
14 | @@ -1,7 +1,7 @@ | ||
15 | ## Process this file with automake to produce Makefile.in | ||
16 | include $(top_srcdir)/Makefile.decl | ||
17 | |||
18 | -SUBDIRS = tutorial faq reference tools | ||
19 | +SUBDIRS = reference tools | ||
20 | |||
21 | EXTRA_DIST += \ | ||
22 | defsformat.txt \ | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch new file mode 100644 index 0000000000..1ae728e70d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Updated to apply to gtk+-2.24.15 | ||
4 | |||
5 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
6 | diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac | ||
7 | --- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 | ||
8 | +++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 | ||
9 | @@ -415,7 +415,7 @@ | ||
10 | case $enable_explicit_deps in | ||
11 | auto) | ||
12 | export SED | ||
13 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
14 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
15 | if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then | ||
16 | enable_explicit_deps=yes | ||
17 | else | ||
18 | @@ -774,7 +774,7 @@ | ||
19 | dnl Now we check to see if our libtool supports shared lib deps | ||
20 | dnl (in a rather ugly way even) | ||
21 | if $dynworks; then | ||
22 | - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" | ||
23 | + module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" | ||
24 | module_deplibs_check=`$module_libtool_config | \ | ||
25 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | ||
26 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | ||
27 | @@ -1574,7 +1574,7 @@ | ||
28 | # We are using gmodule-no-export now, but I'm leaving the stripping | ||
29 | # code in place for now, since pango and atk still require gmodule. | ||
30 | export SED | ||
31 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
32 | +export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
33 | if test -n "$export_dynamic"; then | ||
34 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
35 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff new file mode 100644 index 0000000000..340d12008b --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff | |||
@@ -0,0 +1,102 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: gtk/gtkcellrenderertoggle.c | ||
4 | =================================================================== | ||
5 | --- gtk/gtkcellrenderertoggle.c.orig 2010-06-22 18:11:33.000000000 +0800 | ||
6 | +++ gtk/gtkcellrenderertoggle.c 2010-06-22 18:11:43.000000000 +0800 | ||
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+/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+/xsettings.patch new file mode 100644 index 0000000000..d0a970ad4d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/xsettings.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: gtk+-2.21.2/gdk/x11/gdkevents-x11.c | ||
4 | =================================================================== | ||
5 | --- gtk+-2.21.2.orig/gdk/x11/gdkevents-x11.c 2010-06-22 17:28:04.000000000 +0800 | ||
6 | +++ gtk+-2.21.2/gdk/x11/gdkevents-x11.c 2010-06-22 17:28:06.000000000 +0800 | ||
7 | @@ -3062,10 +3062,9 @@ | ||
8 | { | ||
9 | GdkScreenX11 *screen = data; | ||
10 | |||
11 | - if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) | ||
12 | - return GDK_FILTER_REMOVE; | ||
13 | - else | ||
14 | - return GDK_FILTER_CONTINUE; | ||
15 | + xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); | ||
16 | + | ||
17 | + return GDK_FILTER_CONTINUE; | ||
18 | } | ||
19 | |||
20 | static Bool | ||