diff options
Diffstat (limited to 'meta/recipes-extended/asciidoc')
| -rw-r--r-- | meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch | 53 | ||||
| -rw-r--r-- | meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb (renamed from meta/recipes-extended/asciidoc/asciidoc_9.0.2.bb) | 21 |
2 files changed, 9 insertions, 65 deletions
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 <ross.burton@intel.com> - -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.2.bb b/meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb index 711bfbfb9b..e112eb513d 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_9.0.2.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb @@ -4,13 +4,13 @@ articles, books and UNIX man pages." HOMEPAGE = "http://asciidoc.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ - file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=aaee33adce0fc7cc40fee23f82f7f101 \ + file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \ - file://auto-catalogs.patch" -SRCREV = "9a407dc9a497364c91421fd961954eddb565baf1" +SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main" +SRCREV = "545b79b8d7dae70d12bf0657359bdd36de0c5c26" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" @@ -20,12 +20,9 @@ S = "${WORKDIR}/git" # 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 +inherit setuptools3 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<pver>(\d+(\.\d+)+))$" |