libx11: Apply the keysymdef.h fix to libx11 as well as diet-x11

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3399 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xorg-lib/diet-x11_1.1.2.bb b/meta/packages/xorg-lib/diet-x11_1.1.2.bb
index 9f1e877ab8280e55717dd95e900869e8c37ecf61..d3b7dda4a42860dd36a88f297e06cd541f9a3103 100644 (file)
--- a/meta/packages/xorg-lib/diet-x11_1.1.2.bb
+++ b/meta/packages/xorg-lib/diet-x11_1.1.2.bb
@@ -4,5 +4,5 @@ SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
             file://fix-disable-xlocale.diff;patch=1 \
             file://fix-utf8-wrong-define.patch;patch=1"
 
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"

diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb
index a4400ae88e67f63a709a3e90a93d7379af1c0e79..c4a8d140f30a8644ebc1653602033067c9a4edd0 100644 (file)
--- a/meta/packages/xorg-lib/libx11_1.1.2.bb
+++ b/meta/packages/xorg-lib/libx11_1.1.2.bb
@@ -12,7 +12,7 @@ XORG_PN = "libX11"
 SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
             file://include_fix.patch;patch=1" 
 
-EXTRA_OECONF += "--without-xcb"
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
 do_compile() {
         (