diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-28 11:19:51 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-28 11:26:11 +0200 |
| commit | 930f3db16724f95ebcf641d2887bb773f296c295 (patch) | |
| tree | ad8eda67a304082157fb5fda7e50a9de268fe51c /package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch | |
| parent | 2831a05d03dc826f98d6bdcf0da6fc032d246ac8 (diff) | |
xorg: bump version of xutil/macros to 1.2.2
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>
Diffstat (limited to 'package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch')
| -rw-r--r-- | package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch | 15 |
1 files changed, 0 insertions, 15 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) |