From 93e699efd90a11677d32434f9c41fe08c25f0160 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <dexuan.cui@intel.com>
Date: Tue, 19 Apr 2011 16:06:08 +0800
Subject: util-macros: upgrade from 1.11.0 to 1.13.0

removed xaw.patch since it's not used by any recipe now.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../xorg-util/util-macros/xaw.patch                | 14 -------------
 .../xorg-util/util-macros_1.11.0.bb                | 24 ----------------------
 .../xorg-util/util-macros_1.13.0.bb                | 24 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-util/util-macros/xaw.patch
 delete mode 100644 meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
 create mode 100644 meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb

diff --git a/meta/recipes-graphics/xorg-util/util-macros/xaw.patch b/meta/recipes-graphics/xorg-util/util-macros/xaw.patch
deleted file mode 100644
index 8b39869cc..000000000
--- a/meta/recipes-graphics/xorg-util/util-macros/xaw.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: util-macros-1.2.1/xorg-macros.m4.in
-===================================================================
---- util-macros-1.2.1.orig/xorg-macros.m4.in	2009-01-15 13:49:56.000000000 +0000
-+++ util-macros-1.2.1/xorg-macros.m4.in	2009-01-15 13:52:22.000000000 +0000
-@@ -456,3 +456,9 @@
- fi
- AC_SUBST(CWARNFLAGS)
- ]) # XORG_CWARNFLAGS
-+
-+AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT], [
-+PKG_CHECK_MODULES(TMP_XAW, xaw7)
-+$1_CFLAGS=$TMP_XAW_CFLAGS
-+$1_LIBS=$TMP_XAW_LIBS
-+])
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
deleted file mode 100644
index 765a577a1..000000000
--- a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "X autotools macros"
-
-DESCRIPTION = "M4 autotools macros used by various X.org programs."
-
-require xorg-util-common.inc
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662"
-
-PE = "1"
-PR = "r0"
-
-# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-DEPENDS = "libgpg-error"
-DEPENDS_virtclass-native = "gettext"
-DEPENDS_virtclass-nativesdk = "gettext"
-
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "8580021f3a9e242ab09d23d62e475d53"
-SRC_URI[sha256sum] = "212c3d14474d7cffdbc22437d4896211a5dce6b99b02b96229c9be7d963c90cf"
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
new file mode 100644
index 000000000..a708ed0cc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "X autotools macros"
+
+DESCRIPTION = "M4 autotools macros used by various X.org programs."
+
+require xorg-util-common.inc
+
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662"
+
+PE = "1"
+PR = "r0"
+
+# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
+DEPENDS = "libgpg-error"
+DEPENDS_virtclass-native = "gettext"
+DEPENDS_virtclass-nativesdk = "gettext"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI[md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1"
+SRC_URI[sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
-- 
cgit v1.2.3