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 @@
----
- xorg-macros.m4.in |    2 --
- 1 file changed, 2 deletions(-)
-
---- 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
- 
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
--
- AC_PATH_PROG(DOCBOOKPS, docbook2ps)
- AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
- AC_PATH_PROG(DOCBOOKHTML, docbook2html)
- AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
- 
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 @@
+DESCRIPTION = "X autotools macros"
+
 require xorg-util-common.inc
 
-DESCRIPTION = "X autotools macros"
-PE = "1"
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b8b2965be9997891cf7ddccdfb242ca8"
 
-SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
+PE = "1"
+PR = "r0"
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 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 @@
 HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
+
 SECTION = "x11/utils"
 LICENSE = "MIT-X"