summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-07-02 15:27:23 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-02 15:32:46 -0700
commit95bc479d92ca46173b520fddfae983068d38562d (patch)
treef3046c231ae1c900bd428302741da0a21251ab0d /meta/packages
parentd6615c294004e231278b881568a1a2cf4f85a3e8 (diff)
downloadopenembedded-core-95bc479d92ca46173b520fddfae983068d38562d.tar.gz
openembedded-core-95bc479d92ca46173b520fddfae983068d38562d.tar.bz2
openembedded-core-95bc479d92ca46173b520fddfae983068d38562d.tar.xz
openembedded-core-95bc479d92ca46173b520fddfae983068d38562d.zip
util-macros: upgrade to the latest version 1.10.0
Deleted the patch unbreak_cross_compile.patch since upstream has fixed the issue: commit 5d7f8c2638a3b2c3bba8deb01e94703310b62cc4 Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Date: Thu Mar 25 18:10:00 2010 -0500 doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> BTW: the repository is at: git clone git://anongit.freedesktop.org/git/xorg/util/macros and the above commit can be viewed via http://cgit.freedesktop.org/xorg/util/macros/commit/?id=5d7f8c2638a3b2c3bba8deb01e94703310b62cc4 Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-util/files/unbreak_cross_compile.patch19
-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.inc2
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 1f784944d..000000000
--- 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 052a65873..d3bf613a6 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 86603e40b..18d022c49 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"