summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch53
-rw-r--r--meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb (renamed from meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb)5
2 files changed, 2 insertions, 56 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 @@
1If SGML_CATALOG_FILES is in the environment, pass --catalogs to xmllint and
2xsltproc. Also pass --nonet to xsltproc to detect future missing stylesheet
3problems.
4
5An earlier version of this patch was filed upstream at
6https://github.com/asciidoc/asciidoc-py3/issues/61 so depending on how that goes
7this could get merged.
8
9Upstream-Status: Inappropriate
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11
12diff --git a/a2x.py b/a2x.py
13index 2d7699a..582d809 100755
14--- a/a2x.py
15+++ b/a2x.py
16@@ -57,6 +57,10 @@ LYNX_OPTS = '-dump'
17 W3M_OPTS = '-dump -cols 70 -T text/html -no-graph'
18 XSLTPROC_OPTS = ''
19
20+if "SGML_CATALOG_FILES" in os.environ:
21+ XMLLINT += " --catalogs"
22+ XSLTPROC += " --catalogs"
23+
24 ######################################################################
25 # End of configuration file parameters.
26 ######################################################################
27@@ -298,7 +302,7 @@ def exec_xsltproc(xsl_file, xml_file, dst_dir, opts = ''):
28 cwd = os.getcwd()
29 shell_cd(dst_dir)
30 try:
31- shell('"%s" %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file))
32+ shell('%s %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file))
33 finally:
34 shell_cd(cwd)
35
36@@ -483,7 +487,7 @@ class A2X(AttrDict):
37 self.asciidoc_opts += ' --doctype %s' % self.doctype
38 for attr in self.attributes:
39 self.asciidoc_opts += ' --attribute "%s"' % attr
40-# self.xsltproc_opts += ' --nonet'
41+ self.xsltproc_opts += ' --nonet'
42 if self.verbose:
43 self.asciidoc_opts += ' --verbose'
44 self.dblatex_opts += ' -V'
45@@ -634,7 +638,7 @@ class A2X(AttrDict):
46 shell('"%s" --backend docbook -a "a2x-format=%s" %s --out-file "%s" "%s"' %
47 (self.asciidoc, self.format, self.asciidoc_opts, docbook_file, self.asciidoc_file))
48 if not self.no_xmllint and XMLLINT:
49- shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file))
50+ shell('%s --nonet --noout --valid "%s"' % (XMLLINT, docbook_file))
51
52 def to_xhtml(self):
53 self.to_docbook()
diff --git a/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb b/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb
index bb4248a5e5..523bf33f42 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb
@@ -8,9 +8,8 @@ LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ 8LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \
9 file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " 9 file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 "
10 10
11SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \ 11SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=9.x"
12 file://auto-catalogs.patch" 12SRCREV = "9705d428439530104ce55d0ba12e8ef9d1b57ad1"
13SRCREV = "8de61a75572b5b8f90c1f87634aa3767472be7a7"
14 13
15DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 14DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
16 15