summaryrefslogtreecommitdiff
path: root/meta/packages/xorg-util/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/xorg-util/files')
-rw-r--r--meta/packages/xorg-util/files/unbreak_cross_compile.patch25
1 files changed, 9 insertions, 16 deletions
diff --git a/meta/packages/xorg-util/files/unbreak_cross_compile.patch b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
index fd84aade1..1f784944d 100644
--- a/meta/packages/xorg-util/files/unbreak_cross_compile.patch
+++ b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
@@ -1,21 +1,12 @@
---
- xorg-macros.m4.in | 4 ----
- 1 file changed, 4 deletions(-)
+ xorg-macros.m4.in | 2 --
+ 1 file changed, 2 deletions(-)
-Index: util-macros-1.1.5/xorg-macros.m4.in
-===================================================================
---- util-macros-1.1.5.orig/xorg-macros.m4.in 2006-11-08 14:23:10.000000000 +0000
-+++ util-macros-1.1.5/xorg-macros.m4.in 2007-01-31 15:28:55.000000000 +0000
-@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
- XORG_SGML_PATH=$prefix/share/sgml
- HAVE_DEFS_ENT=
-
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
--
- AC_PATH_PROG(LINUXDOC, linuxdoc)
- AC_PATH_PROG(PS2PDF, ps2pdf)
-
-@@ -250,8 +248,6 @@ BUILDPDFDOC=no
+--- util-macros-1.1.6.orig/xorg-macros.m4.in
++++ util-macros-1.1.6/xorg-macros.m4.in
+@@ -252,12 +252,10 @@ HAVE_DEFS_ENT=
+ BUILDTXTDOC=no
+ BUILDPDFDOC=no
BUILDPSDOC=no
BUILDHTMLDOC=no
@@ -24,3 +15,5 @@ Index: util-macros-1.1.5/xorg-macros.m4.in
AC_PATH_PROG(DOCBOOKPS, docbook2ps)
AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+ AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+