summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-05-09 09:41:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 09:56:21 +0100
commited18794c37338788a5b18f222c36d21793b1a523 (patch)
tree2add979f415fb3df970cafb7cb8316dd7312a068
parent60c1542baba1dcc01f1bef185878a13fe9bce5ed (diff)
downloadpoky-ed18794c37338788a5b18f222c36d21793b1a523.tar.gz
gnome-doc-utils: Add additional missing -nonet options to xsltproc
I missed some instances of xsltproc when adding -nonet in my previous commit. This should take care of them all to fix the compilation errors. (From OE-Core rev: b232ad2c74c93f045006a6b03b2eff7f6103a865) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch70
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb2
2 files changed, 69 insertions, 3 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
index 73d22bfc99..ad81c2fafc 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -1,5 +1,5 @@
1This adds the -nonet option to xsltproc invocations, which fixes 1This adds the -nonet option to xsltproc invocations, which fixes
2compile errors when building gnome-doc-xslt-de.omf. 2compile errors when building the gnome-doc-utils docs.
3 3
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
@@ -7,7 +7,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7 7
8diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20.5/doc/xslt/Makefile.am 8diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20.5/doc/xslt/Makefile.am
9--- gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am 2011-03-22 06:56:17.000000000 -0700 9--- gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am 2011-03-22 06:56:17.000000000 -0700
10+++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am 2011-05-04 21:03:29.382491164 -0700 10+++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am 2011-05-09 09:35:04.946138220 -0700
11@@ -21,14 +21,14 @@ 11@@ -21,14 +21,14 @@
12 12
13 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl 13 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
@@ -25,6 +25,15 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20
25 --stringparam basename "$(basename $(notdir $@))" \ 25 --stringparam basename "$(basename $(notdir $@))" \
26 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ 26 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
27 "$(srcdir)/xsldoc-docbook.xsl" "$<" 27 "$(srcdir)/xsldoc-docbook.xsl" "$<"
28@@ -62,7 +62,7 @@
29 gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
30 @echo "Running xsldoc checks";
31 @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
32- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
33+ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
34
35 .PHONY: clean-xsldoc
36 clean-local: clean_xsldoc
28@@ -75,4 +75,4 @@ 37@@ -75,4 +75,4 @@
29 DOC_MODULE = gnome-doc-xslt 38 DOC_MODULE = gnome-doc-xslt
30 DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base)) 39 DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base))
@@ -32,3 +41,60 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20
32-DOC_LINGUAS = de 41-DOC_LINGUAS = de
33\ No newline at end of file 42\ No newline at end of file
34+DOC_LINGUAS = de 43+DOC_LINGUAS = de
44diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-utils-0.20.5/tools/gnome-doc-utils.make
45--- gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make 2011-03-22 06:56:17.000000000 -0700
46+++ gnome-doc-utils-0.20.5/tools/gnome-doc-utils.make 2011-05-09 09:34:03.278985782 -0700
47@@ -37,7 +37,7 @@
48 list='$(DOC_H_DOCS)'; for doc in $$list; do \
49 xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
50 if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
51- xsltproc --path "$$xmlpath" $(_credits) $$doc; \
52+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \
53 done | sort | uniq \
54 | 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}}' \
55 | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
56@@ -50,7 +50,7 @@
57 docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
58 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
59 echo $$xmlpath; \
60- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
61+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
62 for id in $$ids; do \
63 echo '#define HELP_'`echo $$docid`'_'`echo $$id \
64 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
65@@ -180,7 +180,7 @@
66 echo "The file '$(_skcontentslist)' does not exist." >&2; \
67 echo "Please check your ScrollKeeper installation." >&2; \
68 exit 1; }
69- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
70+ xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
71
72 ## @ _DOC_OMF_HTML
73 ## The OMF files for HTML output
74@@ -195,7 +195,7 @@
75 echo "Please check your ScrollKeeper installation." >&2; \
76 exit 1; }
77 endif
78- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
79+ xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
80
81 ## @ _DOC_OMF_ALL
82 ## All OMF output files to be built
83@@ -250,7 +250,7 @@
84 ## All HTML documentation in the C locale
85 # FIXME: probably have to shell escape to determine the file names
86 _DOC_C_HTML = $(foreach f, \
87- $(shell xsltproc --xinclude \
88+ $(shell xsltproc -nonet --xinclude \
89 --stringparam db.chunk.basename "$(DOC_MODULE)" \
90 $(_chunks) "C/$(DOC_MODULE).xml"), \
91 C/$(f).xhtml)
92@@ -379,7 +379,7 @@
93 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
94
95 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
96- xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
97+ 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,$@)
98
99
100 ################################################################################
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb
index 1c864b2296..115eb4d654 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb
@@ -1,7 +1,7 @@
1require gnome-doc-utils.inc 1require gnome-doc-utils.inc
2LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ 2LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
3 file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" 3 file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
4PR = "r1" 4PR = "r2"
5 5
6SRC_URI += "file://xsltproc_nonet.patch" 6SRC_URI += "file://xsltproc_nonet.patch"
7 7