From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 11 Feb 2011 16:46:29 +0000 (+0100)
Subject: xkbcomp: upgrade from 1.2.0 to 1.2.1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d917bd637e5d44316de750bf50a25e7d4a2afde8;p=openembedded.git

xkbcomp: upgrade from 1.2.0 to 1.2.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/xorg-app/xkbcomp-1.2.0/fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch b/recipes/xorg-app/xkbcomp-1.2.0/fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch
deleted file mode 100644
index fcc3b03c58..0000000000
--- a/recipes/xorg-app/xkbcomp-1.2.0/fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_CHECK_FILE([$srcdir/xkbparse.c] fails while cross compiling
-  | checking for ./xkbparse.c... configure: error: cannot check for file existence when cross compiling
-later found bugreport with similar patch
-https://bugs.freedesktop.org/show_bug.cgi?id=31264
-
---- xkbcomp-1.2.0.orig/configure.ac	2010-10-30 18:59:33.000000000 +0200
-+++ xkbcomp-1.2.0/configure.ac	2010-11-01 08:56:36.000000000 +0100
-@@ -36,9 +36,7 @@
- 
- 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])])
--
-+test ! -e $srcdir/xkbparse.c -a -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
- 
- AC_CHECK_FUNCS([strdup strcasecmp])
- 
diff --git a/recipes/xorg-app/xkbcomp_1.2.0.bb b/recipes/xorg-app/xkbcomp_1.2.0.bb
deleted file mode 100644
index 3f223d91bc..0000000000
--- a/recipes/xorg-app/xkbcomp_1.2.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch"
-
-SRC_URI[archive.md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
-SRC_URI[archive.sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.2.1.bb b/recipes/xorg-app/xkbcomp_1.2.1.bb
new file mode 100644
index 0000000000..30e31cdc61
--- /dev/null
+++ b/recipes/xorg-app/xkbcomp_1.2.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "885b4d8a7c8c7afb3312d31934cb3549"
+SRC_URI[archive.sha256sum] = "b7612527914402d091424a93bc16f0d4d8778b4a874171f3f3dc681c690e65eb"
+
+BBCLASSEXTEND = "native"