diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
commit | c58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch) | |
tree | 3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch | |
parent | eec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff) | |
download | meta-openembedded-contrib-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz |
move layer into meta-oe in preparation for future splits
As per TSC decision
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch')
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch b/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch new file mode 100644 index 0000000000..b74d9c9639 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch @@ -0,0 +1,24 @@ +commit eff1fe2500f07fa2b4683ff52fe92e39e6487b05 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Fri May 21 12:13:05 2010 -0400 + + Make the !xkb build survive a little longer + + This fixes bug 619114. + +diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c +index c0cbc99..6cded79 100644 +--- a/gdk/x11/gdkdisplay-x11.c ++++ b/gdk/x11/gdkdisplay-x11.c +@@ -690,7 +690,11 @@ gdk_display_beep (GdkDisplay *display) + { + g_return_if_fail (GDK_IS_DISPLAY (display)); + ++#ifdef HAVE_XKB + XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None); ++#else ++ XBell (GDK_DISPLAY_XDISPLAY (display), 0); ++#endif + } + + /** |