From: Graham Gower <graham.gower@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH] gtk+_2.20.1.bb: Fix build with --disable-xkb.
Date: Fri, 24 Sep 2010 16:26:32 +0930 [thread overview]
Message-ID: <4C9C4BA0.2090200@gmail.com> (raw)
See https://bugzilla.gnome.org/show_bug.cgi?id=619114
Signed-off-by: Graham Gower <graham.gower@gmail.com>
---
recipes/gtk+/files/xkb-ifdef.patch | 24 ++++++++++++++++++++++++
recipes/gtk+/gtk+_2.20.1.bb | 1 +
2 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 recipes/gtk+/files/xkb-ifdef.patch
diff --git a/recipes/gtk+/files/xkb-ifdef.patch b/recipes/gtk+/files/xkb-ifdef.patch
new file mode 100644
index 0000000..b74d9c9
--- /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 ca5e197..f9367b7 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"
--
1.7.1
reply other threads:[~2010-09-24 6:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C9C4BA0.2090200@gmail.com \
--to=graham.gower@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox