From 67e5286b931df3207f9bb44cd58f8aafa8c80f96 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Sat, 9 Apr 2011 22:27:12 +0800 Subject: xkbcomp: upgrade from 1.2.0 to 1.2.1 - Also remove the cross compiling patch, since it is already included in 1.2.1 release Signed-off-by: Yu Ke --- .../xorg-app/xkbcomp/cross-compile-fix.patch | 35 ---------------------- meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb | 19 ------------ meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb | 18 +++++++++++ 3 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch delete mode 100644 meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb create mode 100644 meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch deleted file mode 100644 index ca6534563..000000000 --- a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit cc55d8f5ab021861308b071aab9c03016be15187 -Author: Gaetan Nadon -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 - Signed-off-by: Gaetan Nadon - -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.2.0.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb deleted file mode 100644 index f57469089..000000000 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "A program to compile XKB keyboard description" - -DESCRIPTION = "The xkbcomp keymap compiler converts a description of an \ -XKB keymap into one of several output formats. The most common use for \ -xkbcomp is to create a compiled keymap file (.xkm extension) which can \ -be read directly by XKB-capable X servers or utilities." - -LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" - -DEPENDS += "libxkbfile" - -SRC_URI += "file://cross-compile-fix.patch" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a" -SRC_URI[sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4" diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb new file mode 100644 index 000000000..0cf334adb --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb @@ -0,0 +1,18 @@ +require xorg-app-common.inc + +SUMMARY = "A program to compile XKB keyboard description" + +DESCRIPTION = "The xkbcomp keymap compiler converts a description of an \ +XKB keymap into one of several output formats. The most common use for \ +xkbcomp is to create a compiled keymap file (.xkm extension) which can \ +be read directly by XKB-capable X servers or utilities." + +LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" + +DEPENDS += "libxkbfile" + +SRC_URI[md5sum] = "885b4d8a7c8c7afb3312d31934cb3549" +SRC_URI[sha256sum] = "b7612527914402d091424a93bc16f0d4d8778b4a874171f3f3dc681c690e65eb" + +BBCLASSEXTEND = "native" + -- cgit v1.2.3