mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

asciidoc: update 9.0.4 -> 9.1.0

Browse Source 
Dropped patch supserseded by https://github.com/asciidoc-py/asciidoc-py/pull/172

(From OE-Core rev: 4051cb4ac24c75494b26e1422e281196ae5c9e3b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-03-19 09:43:54 +01:00
committed by Richard Purdie
parent e0f94da010
commit 64ddf97b34
2 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch
View File

@@ -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()

5
meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb → meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb
View File

@@ -8,9 +8,8 @@ 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"
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"