From: Yu Ke <ke.yu@intel.com>
Date: Fri, 14 Jan 2011 04:18:50 +0000 (+0800)
Subject: xkbcomp: upgrade to 1.2.0
X-Git-Tag: 2011-1~2862
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=75e9e0af7ad224c46fc66a268ea7a6c44167f132;p=openembedded-core.git

xkbcomp: upgrade to 1.2.0

- also pick one patch from upstream to fix the cross compiling error during the do_configure. it can be safely removed in the next upgrade.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---

diff --git a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
new file mode 100644
index 0000000000..ca65345636
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
@@ -0,0 +1,35 @@
+commit cc55d8f5ab021861308b071aab9c03016be15187
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Oct 31 20:35:24 2010 -0400
+
+    config: replace AC_CHECK_FILE with test -f as it fails to cross-compile
+    
+    Testing for the presence of xkbparse.c is legitimate as this is a build
+    file, but the Autoconf macro assumes it is testing on the host system
+    and fails.
+    
+    Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+diff --git a/configure.ac b/configure.ac
+index c69230b..8e6bd6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
++# If both the C file and YACC are missing, the package cannot be build.
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/xkbparse.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
+-
++if test ! -f "$srcdir/xkbparse.c"; then
++   if test -z "$YACC_INST"; then
++      AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
++   fi
++fi
+ 
+ AC_CHECK_FUNCS([strdup strcasecmp])
+ 
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
similarity index 61%
rename from meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
rename to meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
index bd40e4287d..b8592fa470 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
 
 DEPENDS += "libxkbfile"
 
+SRC_URI += "file://cross-compile-fix.patch"
+
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "38c387bacdc01038c8ac280588792bcf"
-SRC_URI[sha256sum] = "9775bcfd43d9ffa41e2865e5b2c933f419bf983d7a529b3103656c76fd82e663"
+SRC_URI[md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
+SRC_URI[sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"