From 59b0aa7a7ee327688a77dd5d01d0b2032f6535a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Mar 2009 14:59:14 +0000 Subject: x11r7: update to 7.4 Patch by Dan Lykowski , closes #181. Minor fixups for kdrive by me. --- .../xutil_util-macros-1.1.5-linuxdoc.patch | 15 --------------- .../x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch | 8 -------- .../xutil_util-macros-1.1.6-linuxdoc.patch | 15 +++++++++++++++ .../x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch | 8 ++++++++ package/x11r7/xutil_util-macros/xutil_util-macros.mk | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch delete 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-1.1.6-linuxdoc.patch create mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch (limited to 'package/x11r7/xutil_util-macros') 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 deleted file mode 100644 index 9f7dfaabb..000000000 --- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index 97a2dc4d1..000000000 --- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- 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-1.1.6-linuxdoc.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch new file mode 100644 index 000000000..26c83aac0 --- /dev/null +++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch @@ -0,0 +1,15 @@ +--- util-macros-1.1.6/xorg-macros.m4.in.orig 2007-06-08 22:23:00.000000000 +0200 ++++ util-macros-1.1.6/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.6.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch new file mode 100644 index 000000000..3b70e7cc3 --- /dev/null +++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch @@ -0,0 +1,8 @@ +--- util-macros-1.1.6/xorg-macros.m4.in.orig 2007-06-10 11:34:17.000000000 +0200 ++++ util-macros-1.1.6/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 index 2baeeb93f..9cc2a4518 100644 --- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk +++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.1.5 +XUTIL_UTIL_MACROS_VERSION = 1.1.6 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 = NO -- cgit v1.2.3