NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg: bump version of xutil/macros to 1.2.2

Browse Source 
This version bump is required by the bump of xlib_libXt from 1.0.5 to
1.0.6 (1.0.6 requires at least xutil/macros 1.2).

The linuxdoc patch is removed, since it has been merged upstream, at
http://cgit.freedesktop.org/xorg/util/macros/commit/?id=e20c503d24e5ccf03035aa0f6d833d235d2179df

The other patch exposing STAGING_DIR is kept, as it is Buildroot
specific. It has just been updated to resolve conflicts.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-07-28 11:19:51 +02:00
parent 2831a05d03
commit 930f3db167
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch
View File

@ -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)

8
package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch
View File

@ -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)

16
package/x11r7/xutil_util-macros/xutil_util-macros-1.2.2.patch Normal file
View File

@ -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

2
package/x11r7/xutil_util-macros/xutil_util-macros.mk
View File

@ -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