summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch')
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch95
1 files changed, 95 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
new file mode 100644
index 0000000000..9346494e95
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -0,0 +1,95 @@
1This adds the -nonet option to xsltproc invocations, which fixes
2compile errors when building the gnome-doc-utils docs.
3
4Upstream-Status: Inappropriate [configuration]
5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
7
8Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
9===================================================================
10--- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am
11+++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
12@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls)
13
14 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
15 $(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
16- | xsltproc -o "$@" \
17+ | xsltproc -nonet -o "$@" \
18 --stringparam basename "$(basename $(notdir $@))" \
19 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
20 "$(srcdir)/xsldoc-fill.xsl" -
21
22 $(xsldoc_xmls): xsldoc-docbook.xsl
23 $(xsldoc_xmls): C/%.xml : C/%.xsldoc
24- $(AM_V_GEN)xsltproc -o "$@" \
25+ $(AM_V_GEN)xsltproc -nonet -o "$@" \
26 --stringparam basename "$(basename $(notdir $@))" \
27 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
28 "$(srcdir)/xsldoc-docbook.xsl" "$<"
29@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes:
30 gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
31 @echo "Running xsldoc checks";
32 @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
33- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
34+ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
35
36 .PHONY: clean-xsldoc
37 clean-local: clean_xsldoc
38Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
39===================================================================
40--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
41+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
42@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
43 list='$(DOC_H_DOCS)'; for doc in $$list; do \
44 xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
45 if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
46- xsltproc --path "$$xmlpath" $(_credits) $$doc; \
47+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \
48 done | sort | uniq \
49 | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
50 | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
51@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
52 docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
53 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
54 echo $$xmlpath; \
55- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
56+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
57 for id in $$ids; do \
58 echo '#define HELP_'`echo $$docid`'_'`echo $$id \
59 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
60@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
61 echo "The file '$(_skcontentslist)' does not exist." >&2; \
62 echo "Please check your ScrollKeeper installation." >&2; \
63 exit 1; }
64- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
65+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
66
67 ## @ _DOC_OMF_HTML
68 ## The OMF files for HTML output
69@@ -212,7 +212,7 @@ if ENABLE_SK
70 echo "Please check your ScrollKeeper installation." >&2; \
71 exit 1; }
72 endif
73- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
74+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
75
76 ## @ _DOC_OMF_ALL
77 ## All OMF output files to be built
78@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
79 ## All HTML documentation in the C locale
80 # FIXME: probably have to shell escape to determine the file names
81 _DOC_C_HTML = $(foreach f, \
82- $(shell xsltproc --xinclude \
83+ $(shell xsltproc -nonet --xinclude \
84 --stringparam db.chunk.basename "$(DOC_MODULE)" \
85 $(_chunks) "C/$(DOC_MODULE).xml"), \
86 C/$(f).xhtml)
87@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
88 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
89
90 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
91- $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
92+ $(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
93
94
95 ################################################################################
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 08:58:57 +0000