From: Koen Kooi <koen@openembedded.org>
Date: Wed, 27 Jan 2010 14:23:22 +0000 (+0100)
Subject: gtk+ 2.18.3: enable xkb for angstrom
X-Git-Tag: Release-2010-05/1~713^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c103ba2ea133db3be7009b07bcc706f255de97d;p=openembedded.git

gtk+ 2.18.3: enable xkb for angstrom

* also remove the displaymigration option that has ceased to exist
---

diff --git a/recipes/gtk+/gtk+_2.18.3.bb b/recipes/gtk+/gtk+_2.18.3.bb
index 34d4491d66..65d0b86734 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-*"