xmlto: add version 0.0.25

It moved from meta-oe and fixed the defect that xmlto/xsltproc
stylesheets cannot be found even when they are installed in
sysroot.

About the config files (catalog.xml), we refered what Ubuntu
13.04 did, so it could correctly search the xsl stylesheets
and xml dtds.

Assigned the environment variable XML_CATALOG_FILES, so the
xmlto will use oe-core's config as priority to avoid the
the search from build system.

[YOCTO #2416]

(From OE-Core rev: 6eccf7940e90dd06568f7a2da36ce2d5d090aed5)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia 2014-07-15 20:18:06 +08:00 committed by Richard Purdie
parent 605e1f38f4
commit c95dec0b93
4 changed files with 98 additions and 0 deletions

View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<delegateSystem systemIdStartString="http://docbook.org/xml/" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBk XML" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBook XML" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBk XML" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430" catalog="./docbook-xml.xml"/>
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/" catalog="./docbook-xml.xml"/>
<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model" catalog="./docbook-xml.xml"/>
<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="./docbook-xsl.xml"/>
<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="./docbook-xsl.xml"/>
</catalog>

View File

@ -0,0 +1,30 @@
configure.in: drop the test of xmllint and xsltproc
The test is unnecessary, the xmllint and xsltproc were explicitly
added to RDEPENDS.
Upstream-Status: oe-specific
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.])
AC_PATH_PROG([LOCALE], [locale], [locale])
AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.])
-AC_PATH_PROG([XMLLINT], [xmllint], [xmllint])
+dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint])
AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.])
-AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])
+dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])
dnl
dnl toolchains
--
1.8.1.2

View File

@ -0,0 +1,12 @@
diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
--- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200
+++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200
@@ -1,7 +1,7 @@
AC_INIT(xmlto, 0.0.25)
AC_CONFIG_SRCDIR(xmlto.spec.in)
AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_PROG_CC
AM_PROG_CC_C_O

View File

@ -0,0 +1,37 @@
SUMMARY = "A shell-script tool for converting XML files to various formats"
HOMEPAGE = "https://fedorahosted.org/xmlto/"
SECTION = "docs/xmlto"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
file://obsolete_automake_macros.patch \
file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \
file://catalog.xml \
"
SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d"
SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a"
inherit autotools
# xmlto needs getopt/xmllint/xsltproc at runtime
RDEPENDS_${PN} = "docbook-xml-dtd4 \
docbook-xsl-stylesheets \
util-linux \
libxml2 \
"
RDEPENDS_${PN}_append_class-target = " \
libxslt-bin \
"
BBCLASSEXTEND = "native"
EXTRA_OECONF_append = " XMLLINT=xmllint XSLTPROC=xsltproc"
do_install_append() {
install -d ${D}${sysconfdir}/xml/
install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml
create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml
}