diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-06 10:36:31 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-06 10:36:31 +0000 |
| commit | b3f5ec3f8906c4e166433590e3f9f579f4a0a528 (patch) | |
| tree | 61e26393b2926eb4bb536dc48dcbb52b263f6aa3 | |
| parent | 60bae70bee11dd938160710be38b5e8a1c028c12 (diff) | |
| download | poky-b3f5ec3f8906c4e166433590e3f9f579f4a0a528.tar.gz | |
util-macros: upgrade to 1.1.6
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3964 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/xorg-util/files/unbreak_cross_compile.patch | 25 | ||||
| -rw-r--r-- | meta/packages/xorg-util/util-macros-native_1.1.6.bb (renamed from meta/packages/xorg-util/util-macros-native_1.1.5.bb) | 0 | ||||
| -rw-r--r-- | meta/packages/xorg-util/util-macros-sdk_1.1.6.bb (renamed from meta/packages/xorg-util/util-macros-sdk_1.1.5.bb) | 0 | ||||
| -rw-r--r-- | meta/packages/xorg-util/util-macros_1.1.6.bb (renamed from meta/packages/xorg-util/util-macros_1.1.5.bb) | 0 |
4 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 fd84aade1e..1f784944d3 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 @@ | |||
| 1 | --- | 1 | --- |
| 2 | xorg-macros.m4.in | 4 ---- | 2 | xorg-macros.m4.in | 2 -- |
| 3 | 1 file changed, 4 deletions(-) | 3 | 1 file changed, 2 deletions(-) |
| 4 | 4 | ||
| 5 | Index: util-macros-1.1.5/xorg-macros.m4.in | 5 | --- util-macros-1.1.6.orig/xorg-macros.m4.in |
| 6 | =================================================================== | 6 | +++ util-macros-1.1.6/xorg-macros.m4.in |
| 7 | --- util-macros-1.1.5.orig/xorg-macros.m4.in 2006-11-08 14:23:10.000000000 +0000 | 7 | @@ -252,12 +252,10 @@ HAVE_DEFS_ENT= |
| 8 | +++ util-macros-1.1.5/xorg-macros.m4.in 2007-01-31 15:28:55.000000000 +0000 | 8 | BUILDTXTDOC=no |
| 9 | @@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[ | 9 | BUILDPDFDOC=no |
| 10 | XORG_SGML_PATH=$prefix/share/sgml | ||
| 11 | HAVE_DEFS_ENT= | ||
| 12 | |||
| 13 | -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) | ||
| 14 | - | ||
| 15 | AC_PATH_PROG(LINUXDOC, linuxdoc) | ||
| 16 | AC_PATH_PROG(PS2PDF, ps2pdf) | ||
| 17 | |||
| 18 | @@ -250,8 +248,6 @@ BUILDPDFDOC=no | ||
| 19 | BUILDPSDOC=no | 10 | BUILDPSDOC=no |
| 20 | BUILDHTMLDOC=no | 11 | BUILDHTMLDOC=no |
| 21 | 12 | ||
| @@ -24,3 +15,5 @@ Index: util-macros-1.1.5/xorg-macros.m4.in | |||
| 24 | AC_PATH_PROG(DOCBOOKPS, docbook2ps) | 15 | AC_PATH_PROG(DOCBOOKPS, docbook2ps) |
| 25 | AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) | 16 | AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) |
| 26 | AC_PATH_PROG(DOCBOOKHTML, docbook2html) | 17 | AC_PATH_PROG(DOCBOOKHTML, docbook2html) |
| 18 | AC_PATH_PROG(DOCBOOKTXT, docbook2txt) | ||
| 19 | |||
diff --git a/meta/packages/xorg-util/util-macros-native_1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.6.bb index 0f4ed124f0..0f4ed124f0 100644 --- a/meta/packages/xorg-util/util-macros-native_1.1.5.bb +++ b/meta/packages/xorg-util/util-macros-native_1.1.6.bb | |||
diff --git a/meta/packages/xorg-util/util-macros-sdk_1.1.5.bb b/meta/packages/xorg-util/util-macros-sdk_1.1.6.bb index 597868f9b6..597868f9b6 100644 --- a/meta/packages/xorg-util/util-macros-sdk_1.1.5.bb +++ b/meta/packages/xorg-util/util-macros-sdk_1.1.6.bb | |||
diff --git a/meta/packages/xorg-util/util-macros_1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.6.bb index 9cb22ade46..9cb22ade46 100644 --- a/meta/packages/xorg-util/util-macros_1.1.5.bb +++ b/meta/packages/xorg-util/util-macros_1.1.6.bb | |||