@@ -1,4 +1,4 @@
-From 3090dcafac7c8080091b5e3e3720209c65251a1a Mon Sep 17 00:00:00 2001
+From a9a90a95047a0a08bb0fd0823961ed9707f451d4 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 22 May 2006 22:15:57 +0000
Subject: [PATCH] add "-disable-xkb" option
@@ -6,13 +6,12 @@ Subject: [PATCH] add "-disable-xkb" option
Upstream-Status: Pending
Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
-
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
-index e7c2bdf..8e1ed5e 100644
+index e578bfe..1847258 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
similarity index 67%
rename from meta/recipes-graphics/xorg-app/xset_1.2.5.bb
rename to meta/recipes-graphics/xorg-app/xset_1.2.6.bb
@@ -5,8 +5,8 @@ SUMMARY = "Utility for setting various user preference options of the display"
DESCRIPTION = "xset is a utility that is used to set various user \
preference options of the display."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
+LICENSE = "MIT-open-group"
+LIC_FILES_CHKSUM = "file://COPYING;md5=373a2cff5a5e58e7ccff069e0ce9fe74"
DEPENDS += "libxext libxmu libxau"
PE = "1"
@@ -14,7 +14,7 @@ SRC_URI += "file://disable-xkb.patch"
SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f"
+SRC_URI[sha256sum] = "623837349ea887bc003f01ee2e4b6b8ddd9c2774f632c6d70eead1b56306b695"
CFLAGS += "-D_GNU_SOURCE"
EXTRA_OECONF = "--disable-xkb --without-fontcache"
License-update: Upstream added a license identifier, clarify the MIT variant of the license to match. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-graphics/xorg-app/xset/disable-xkb.patch | 5 ++--- .../xorg-app/{xset_1.2.5.bb => xset_1.2.6.bb} | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) rename meta/recipes-graphics/xorg-app/{xset_1.2.5.bb => xset_1.2.6.bb} (67%)