[oe-commits] Koen Kooi : gtk+ 2.18.3: enable xkb for angstrom

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 8c103ba2ea133db3be7009b07bcc706f255de97d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8c103ba2ea133db3be7009b07bcc706f255de97d

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Jan 27 15:23:22 2010 +0100

gtk+ 2.18.3: enable xkb for angstrom

* also remove the displaymigration option that has ceased to exist

---

 recipes/gtk+/gtk+_2.18.3.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes/gtk+/gtk+_2.18.3.bb b/recipes/gtk+/gtk+_2.18.3.bb
index 34d4491..65d0b86 100644
--- a/recipes/gtk+/gtk+_2.18.3.bb
+++ b/recipes/gtk+/gtk+_2.18.3.bb
@@ -1,8 +1,12 @@
 require gtk+.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
+# Enable xkb selectively
+XKBTOGGLE = " --disable-xkb"
+XKBTOGGLE_angstrom = ""
+
+EXTRA_OECONF = "--with-libtiff ${XKBTOGGLE} --disable-glibtest gio_can_sniff=yes"
 
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"