diff options
-rw-r--r-- | meta/packages/xorg-util/files/unbreak_cross_compile.patch | 19 | ||||
-rw-r--r-- | meta/packages/xorg-util/util-macros_1.10.0.bb (renamed from meta/packages/xorg-util/util-macros_1.6.0.bb) | 9 | ||||
-rw-r--r-- | meta/packages/xorg-util/xorg-util-common.inc | 2 |
3 files changed, 8 insertions, 22 deletions
diff --git a/meta/packages/xorg-util/files/unbreak_cross_compile.patch b/meta/packages/xorg-util/files/unbreak_cross_compile.patch deleted file mode 100644 index 1f784944d3..0000000000 --- a/meta/packages/xorg-util/files/unbreak_cross_compile.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | --- | ||
2 | xorg-macros.m4.in | 2 -- | ||
3 | 1 file changed, 2 deletions(-) | ||
4 | |||
5 | --- util-macros-1.1.6.orig/xorg-macros.m4.in | ||
6 | +++ util-macros-1.1.6/xorg-macros.m4.in | ||
7 | @@ -252,12 +252,10 @@ HAVE_DEFS_ENT= | ||
8 | BUILDTXTDOC=no | ||
9 | BUILDPDFDOC=no | ||
10 | BUILDPSDOC=no | ||
11 | BUILDHTMLDOC=no | ||
12 | |||
13 | -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) | ||
14 | - | ||
15 | AC_PATH_PROG(DOCBOOKPS, docbook2ps) | ||
16 | AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) | ||
17 | AC_PATH_PROG(DOCBOOKHTML, docbook2html) | ||
18 | AC_PATH_PROG(DOCBOOKTXT, docbook2txt) | ||
19 | |||
diff --git a/meta/packages/xorg-util/util-macros_1.6.0.bb b/meta/packages/xorg-util/util-macros_1.10.0.bb index 052a658736..d3bf613a63 100644 --- a/meta/packages/xorg-util/util-macros_1.6.0.bb +++ b/meta/packages/xorg-util/util-macros_1.10.0.bb | |||
@@ -1,9 +1,12 @@ | |||
1 | DESCRIPTION = "X autotools macros" | ||
2 | |||
1 | require xorg-util-common.inc | 3 | require xorg-util-common.inc |
2 | 4 | ||
3 | DESCRIPTION = "X autotools macros" | 5 | LICENSE = "MIT & MIT-style" |
4 | PE = "1" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b8b2965be9997891cf7ddccdfb242ca8" |
5 | 7 | ||
6 | SRC_URI += "file://unbreak_cross_compile.patch;patch=1" | 8 | PE = "1" |
9 | PR = "r0" | ||
7 | 10 | ||
8 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 11 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
9 | DEPENDS = "gettext" | 12 | DEPENDS = "gettext" |
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc index 86603e40b1..18d022c49f 100644 --- a/meta/packages/xorg-util/xorg-util-common.inc +++ b/meta/packages/xorg-util/xorg-util-common.inc | |||
@@ -1,4 +1,6 @@ | |||
1 | HOMEPAGE = "http://www.x.org" | 1 | HOMEPAGE = "http://www.x.org" |
2 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" | ||
3 | |||
2 | SECTION = "x11/utils" | 4 | SECTION = "x11/utils" |
3 | LICENSE = "MIT-X" | 5 | LICENSE = "MIT-X" |
4 | 6 | ||