diff options
4 files changed, 17 insertions, 24 deletions
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 deleted file mode 100644 index 26c83aac0..000000000 --- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index 3b70e7cc3..000000000 --- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- 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-1.2.2.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.2.2.patch new file mode 100644 index 000000000..649db5268 --- /dev/null +++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.2.2.patch @@ -0,0 +1,16 @@ +--- + xorg-macros.m4.in | 3 +++ + 1 file changed, 3 insertions(+) + +Index: xutil_util-macros-1.2.2/xorg-macros.m4.in +=================================================================== +--- xutil_util-macros-1.2.2.orig/xorg-macros.m4.in ++++ xutil_util-macros-1.2.2/xorg-macros.m4.in +@@ -459,3 +459,6 @@ + fi + AC_SUBST(CWARNFLAGS) + ]) # XORG_CWARNFLAGS ++ ++# Buildroot stuff ++AC_SUBST(STAGING_DIR) +\ No newline at end of file diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk index 9cc2a4518..ca1890e3e 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.6 +XUTIL_UTIL_MACROS_VERSION = 1.2.2 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 |