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+/xsettings.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+/xsettings.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/xsettings.patch | 20 |
1 files changed, 20 insertions, 0 deletions
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 | ||