diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-09-23 20:56:32 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2010-09-30 13:16:56 -0700 |
| commit | 9730a28e669931fee601756e949bb210999b4b81 (patch) | |
| tree | 7fc97f61a2c94d1b85d7740b77c322a0723be639 /recipes/gtk+ | |
| parent | ad833a8f47d344d9bc2f5eaa7f3269d633993c61 (diff) | |
| download | openembedded-9730a28e669931fee601756e949bb210999b4b81.tar.gz | |
gtk+_2.20.1.bb: Fix build with --disable-xkb.
See https://bugzilla.gnome.org/show_bug.cgi?id=619114
Signed-off-by: Graham Gower <graham.gower@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/gtk+')
| -rw-r--r-- | recipes/gtk+/files/xkb-ifdef.patch | 24 | ||||
| -rw-r--r-- | recipes/gtk+/gtk+_2.20.1.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/recipes/gtk+/files/xkb-ifdef.patch b/recipes/gtk+/files/xkb-ifdef.patch new file mode 100644 index 0000000000..b74d9c9639 --- /dev/null +++ b/recipes/gtk+/files/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 + } + + /** diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb index ca5e1974a6..f9367b7794 100644 --- a/recipes/gtk+/gtk+_2.20.1.bb +++ b/recipes/gtk+/gtk+_2.20.1.bb @@ -4,6 +4,7 @@ SRC_URI_append_virtclass-native = " file://no-demos.patch \ " SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \ file://cross-nm.patch \ + file://xkb-ifdef.patch \ " SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" |