From a7e49eb2af5d2ca6e53fb908fddfddd92696910a Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 10 Aug 2007 19:07:51 +0000
Subject: Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. 
 Doesn't quite work yet for me, but this clearly is a huge project and not
 having it quite work on the first pass is hardly unexpected.  We definately
 want this stuff in buildroot.

---
 package/x11r7/xutil_util-macros/Config.in                 |  6 ++++++
 .../xutil_util-macros-1.1.5-linuxdoc.patch                | 15 +++++++++++++++
 .../x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch |  8 ++++++++
 package/x11r7/xutil_util-macros/xutil_util-macros.mk      | 14 ++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 package/x11r7/xutil_util-macros/Config.in
 create mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch
 create mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch
 create mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros.mk

(limited to 'package/x11r7/xutil_util-macros')

diff --git a/package/x11r7/xutil_util-macros/Config.in b/package/x11r7/xutil_util-macros/Config.in
new file mode 100644
index 000000000..bc37314ab
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XUTIL_UTIL_MACROS
+	bool "util-macros"
+	default n
+	help
+	  util-macros 1.1.5
+	  No description available
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch
new file mode 100644
index 000000000..9f7dfaabb
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch
@@ -0,0 +1,15 @@
+--- util-macros-1.1.5/xorg-macros.m4.in.orig	2007-06-08 22:23:00.000000000 +0200
++++ util-macros-1.1.5/xorg-macros.m4.in	2007-06-08 22:26:41.000000000 +0200
+@@ -194,7 +194,11 @@
+ XORG_SGML_PATH=$prefix/share/sgml
+ HAVE_DEFS_ENT=
+ 
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++if test "$cross_compiling" = no; then
++   AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++else
++   HAVE_DEFS_ENT=no
++fi
+ 
+ AC_PATH_PROG(LINUXDOC, linuxdoc)
+ AC_PATH_PROG(PS2PDF, ps2pdf)
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch
new file mode 100644
index 000000000..97a2dc4d1
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch
@@ -0,0 +1,8 @@
+--- util-macros-1.1.5/xorg-macros.m4.in.orig	2007-06-10 11:34:17.000000000 +0200
++++ util-macros-1.1.5/xorg-macros.m4.in	2007-06-10 11:34:20.000000000 +0200
+@@ -423,3 +423,5 @@
+ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+ 
+ ]) # XORG_LINT_LIBRARY
++
++AC_SUBST(STAGING_DIR)
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
new file mode 100644
index 000000000..89452f42d
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xutil_util-macros -- No description available
+#
+################################################################################
+
+XUTIL_UTIL_MACROS_VERSION = 1.1.5
+XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
+XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
+XUTIL_UTIL_MACROS_AUTORECONF = YES
+XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
+XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xutil_util-macros))
-- 
cgit v1.2.3