From 29fd4733fdfe89d712bc555a63d85c2b15c5760f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 15 Jan 2009 15:27:11 +0000 Subject: util-macros: Add hack for the loss of the xaw.m4 file until xorg-apps are released which don't use it --- meta/packages/xorg-util/util-macros/xaw.patch | 14 ++++++++++++++ meta/packages/xorg-util/util-macros_1.2.1.bb | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 meta/packages/xorg-util/util-macros/xaw.patch (limited to 'meta/packages/xorg-util') diff --git a/meta/packages/xorg-util/util-macros/xaw.patch b/meta/packages/xorg-util/util-macros/xaw.patch new file mode 100644 index 000000000..8b39869cc --- /dev/null +++ b/meta/packages/xorg-util/util-macros/xaw.patch @@ -0,0 +1,14 @@ +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/packages/xorg-util/util-macros_1.2.1.bb b/meta/packages/xorg-util/util-macros_1.2.1.bb index 79288cd37..9616bd1d1 100644 --- a/meta/packages/xorg-util/util-macros_1.2.1.bb +++ b/meta/packages/xorg-util/util-macros_1.2.1.bb @@ -1,10 +1,11 @@ require xorg-util-common.inc DESCRIPTION = "X autotools macros" -PR = "r2" +PR = "r5" PE = "1" -SRC_URI += "file://unbreak_cross_compile.patch;patch=1" +SRC_URI += "file://unbreak_cross_compile.patch;patch=1 \ + file://xaw.patch;patch=1" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -- cgit v1.2.3