From 64ddf97b3459829861af8803b28a93e04ae95cb7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 19 Mar 2021 09:43:54 +0100 Subject: asciidoc: update 9.0.4 -> 9.1.0 Dropped patch supserseded by https://github.com/asciidoc-py/asciidoc-py/pull/172 (From OE-Core rev: 4051cb4ac24c75494b26e1422e281196ae5c9e3b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../asciidoc/asciidoc/auto-catalogs.patch | 53 ---------------------- meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb | 33 -------------- meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb | 32 +++++++++++++ 3 files changed, 32 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch delete mode 100644 meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb create mode 100644 meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb diff --git a/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch b/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch deleted file mode 100644 index ca170db00f..0000000000 --- a/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch +++ /dev/null @@ -1,53 +0,0 @@ -If SGML_CATALOG_FILES is in the environment, pass --catalogs to xmllint and -xsltproc. Also pass --nonet to xsltproc to detect future missing stylesheet -problems. - -An earlier version of this patch was filed upstream at -https://github.com/asciidoc/asciidoc-py3/issues/61 so depending on how that goes -this could get merged. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -diff --git a/a2x.py b/a2x.py -index 2d7699a..582d809 100755 ---- a/a2x.py -+++ b/a2x.py -@@ -57,6 +57,10 @@ LYNX_OPTS = '-dump' - W3M_OPTS = '-dump -cols 70 -T text/html -no-graph' - XSLTPROC_OPTS = '' - -+if "SGML_CATALOG_FILES" in os.environ: -+ XMLLINT += " --catalogs" -+ XSLTPROC += " --catalogs" -+ - ###################################################################### - # End of configuration file parameters. - ###################################################################### -@@ -298,7 +302,7 @@ def exec_xsltproc(xsl_file, xml_file, dst_dir, opts = ''): - cwd = os.getcwd() - shell_cd(dst_dir) - try: -- shell('"%s" %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) -+ shell('%s %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) - finally: - shell_cd(cwd) - -@@ -483,7 +487,7 @@ class A2X(AttrDict): - self.asciidoc_opts += ' --doctype %s' % self.doctype - for attr in self.attributes: - self.asciidoc_opts += ' --attribute "%s"' % attr --# self.xsltproc_opts += ' --nonet' -+ self.xsltproc_opts += ' --nonet' - if self.verbose: - self.asciidoc_opts += ' --verbose' - self.dblatex_opts += ' -V' -@@ -634,7 +638,7 @@ class A2X(AttrDict): - shell('"%s" --backend docbook -a "a2x-format=%s" %s --out-file "%s" "%s"' % - (self.asciidoc, self.format, self.asciidoc_opts, docbook_file, self.asciidoc_file)) - if not self.no_xmllint and XMLLINT: -- shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) -+ shell('%s --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) - - def to_xhtml(self): - self.to_docbook() diff --git a/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb b/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb deleted file mode 100644 index bb4248a5e5..0000000000 --- a/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Tool for creating HTML, PDF, EPUB, man pages" -DESCRIPTION = "AsciiDoc is a text document format for writing short documents, \ -articles, books and UNIX man pages." - -HOMEPAGE = "http://asciidoc.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ - file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " - -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \ - file://auto-catalogs.patch" -SRCREV = "8de61a75572b5b8f90c1f87634aa3767472be7a7" - -DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" - -S = "${WORKDIR}/git" - -# Tell xmllint where to find the DocBook XML catalogue, because right now it -# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch -export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" - -# Not using automake -inherit autotools-brokensep -CLEANBROKEN = "1" - -# target and nativesdk needs python3, but for native we can use the host. -RDEPENDS_${PN} += "python3" -RDEPENDS_remove_class-native = "python3" - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" diff --git a/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb b/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb new file mode 100644 index 0000000000..523bf33f42 --- /dev/null +++ b/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Tool for creating HTML, PDF, EPUB, man pages" +DESCRIPTION = "AsciiDoc is a text document format for writing short documents, \ +articles, books and UNIX man pages." + +HOMEPAGE = "http://asciidoc.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ + file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " + +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=9.x" +SRCREV = "9705d428439530104ce55d0ba12e8ef9d1b57ad1" + +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" + +S = "${WORKDIR}/git" + +# Tell xmllint where to find the DocBook XML catalogue, because right now it +# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" + +# Not using automake +inherit autotools-brokensep +CLEANBROKEN = "1" + +# target and nativesdk needs python3, but for native we can use the host. +RDEPENDS_${PN} += "python3" +RDEPENDS_remove_class-native = "python3" + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" -- cgit v1.2.3-54-g00ecf