summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-21 16:13:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:43:20 +0000
commit4233009527b73ed38330be1f68dafa845a5b1b09 (patch)
tree3a589ffaa636d09c98dbd2fbbaa3598ec9ad5581 /meta
parentee00527ffc5074fe75c1c64731520a3ad0e8266f (diff)
downloadpoky-4233009527b73ed38330be1f68dafa845a5b1b09.tar.gz
gnome-doc-utils: upgrade to 0.20.10
sysrooted-pkg-config.patch: adapt to the new version use-usr-bin-env-for-python-in-xml2po.patch: adapt to the new version xsltproc_nonet.patch: adapt to the new version (From OE-Core rev: f801dbb0af3ac01e2c8b53600c7a37aa82b08343) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch12
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch25
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch57
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb (renamed from meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb)10
4 files changed, 48 insertions, 56 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
index e17e8b4ec3..416d698641 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
@@ -9,26 +9,24 @@ This should work ok with non sysrooted builds too since in those cases PKG_CONFI
9will be empty 9will be empty
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
14 14
15Index: gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make 15Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
16=================================================================== 16===================================================================
17--- gnome-doc-utils-0.20.6.orig/tools/gnome-doc-utils.make 2011-09-23 22:22:26.000000000 -0700 17--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
18+++ gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make 2011-09-23 22:30:03.479787196 -0700 18+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
19@@ -133,12 +133,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ 19@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
20 _xml2po ?= `which xml2po` 20 _xml2po ?= `which xml2po`
21 _xml2po_mode = $(if $(DOC_ID),mallard,docbook) 21 _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
22 22
23-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` 23-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
24-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` 24-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
25-_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
26-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl 25-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
27-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl 26-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
28-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl 27-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
29+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` 28+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
30+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` 29+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
31+_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
32+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl 30+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
33+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl 31+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
34+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl 32+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
index a285ad2789..0e196c0634 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
@@ -1,30 +1,27 @@
1Upstream-Status="Inappropriate [Would break behavior on Windows]"
2
3We can't use #!/full/path/to/python -u as this can be longer than shebang 1We can't use #!/full/path/to/python -u as this can be longer than shebang
4allows for. In order to be appropraite for upstream more work would be 2allows for. In order to be appropraite for upstream more work would be
5needed to make sure that the main xml2po code doesn't rely on python 3needed to make sure that the main xml2po code doesn't rely on python
6being invoked with -u (force stdin/out/err to be used raw). 4being invoked with -u (force stdin/out/err to be used raw).
7---
8 xml2po/xml2po/Makefile.am | 1 -
9 xml2po/xml2po/xml2po.py.in | 2 +-
10 2 files changed, 1 insertion(+), 2 deletions(-)
11 5
12Index: gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am 6Upstream-Status: Inappropriate [Would break behavior on Windows]
7Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
8
9Index: gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
13=================================================================== 10===================================================================
14--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/Makefile.am 11--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am
15+++ gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am 12+++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
16@@ -7,7 +7,6 @@ CLEANFILES = xml2po 13@@ -7,7 +7,6 @@ CLEANFILES = xml2po
17 14
18 xml2po: xml2po.py.in 15 xml2po: xml2po.py.in
19 sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \ 16 $(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
20- -e "s+^#!.*python.*+#!$(PYTHON)+" \ 17- -e "s+^#!.*python.*+#!$(PYTHON)+" \
21 < $(srcdir)/xml2po.py.in > xml2po 18 < $(srcdir)/xml2po.py.in > xml2po
22 chmod +x xml2po 19 $(AM_V_at)chmod +x xml2po
23 20
24Index: gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in 21Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
25=================================================================== 22===================================================================
26--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/xml2po.py.in 23--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in
27+++ gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in 24+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
28@@ -1,4 +1,4 @@ 25@@ -1,4 +1,4 @@
29-#!/usr/bin/python -u 26-#!/usr/bin/python -u
30+#!/usr/bin/env python 27+#!/usr/bin/env python
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 44d18e7da1..9346494e95 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -2,16 +2,17 @@ This adds the -nonet option to xsltproc invocations, which fixes
2compile errors when building the gnome-doc-utils docs. 2compile errors when building the gnome-doc-utils docs.
3 3
4Upstream-Status: Inappropriate [configuration] 4Upstream-Status: Inappropriate [configuration]
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com> 5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6Signed-off-by: Constantin Musca <constantinx.musca@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 8Index: gnome-doc-utils-0.20.10/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===================================================================
10+++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am 2011-05-09 09:35:04.946138220 -0700 10--- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am
11@@ -21,14 +21,14 @@ 11+++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
12@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls)
12 13
13 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl 14 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
14 $(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ 15 $(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
15- | xsltproc -o "$@" \ 16- | xsltproc -o "$@" \
16+ | xsltproc -nonet -o "$@" \ 17+ | xsltproc -nonet -o "$@" \
17 --stringparam basename "$(basename $(notdir $@))" \ 18 --stringparam basename "$(basename $(notdir $@))" \
@@ -20,12 +21,12 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20
20 21
21 $(xsldoc_xmls): xsldoc-docbook.xsl 22 $(xsldoc_xmls): xsldoc-docbook.xsl
22 $(xsldoc_xmls): C/%.xml : C/%.xsldoc 23 $(xsldoc_xmls): C/%.xml : C/%.xsldoc
23- xsltproc -o "$@" \ 24- $(AM_V_GEN)xsltproc -o "$@" \
24+ xsltproc -nonet -o "$@" \ 25+ $(AM_V_GEN)xsltproc -nonet -o "$@" \
25 --stringparam basename "$(basename $(notdir $@))" \ 26 --stringparam basename "$(basename $(notdir $@))" \
26 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ 27 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
27 "$(srcdir)/xsldoc-docbook.xsl" "$<" 28 "$(srcdir)/xsldoc-docbook.xsl" "$<"
28@@ -62,7 +62,7 @@ 29@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes:
29 gnome-doc-xslt-check-xsldoc: $(xsldoc_docs) 30 gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
30 @echo "Running xsldoc checks"; 31 @echo "Running xsldoc checks";
31 @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \ 32 @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
@@ -34,17 +35,11 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20
34 35
35 .PHONY: clean-xsldoc 36 .PHONY: clean-xsldoc
36 clean-local: clean_xsldoc 37 clean-local: clean_xsldoc
37@@ -75,4 +75,4 @@ 38Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
38 DOC_MODULE = gnome-doc-xslt 39===================================================================
39 DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base)) 40--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
40 41+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
41-DOC_LINGUAS = de 42@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
42\ No newline at end of file
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 \ 43 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/.*//'`"; \ 44 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; \ 45 if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
@@ -53,7 +48,7 @@ diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-util
53 done | sort | uniq \ 48 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}}' \ 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}}' \
55 | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp 50 | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
56@@ -50,7 +50,7 @@ 51@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
57 docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ 52 docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
58 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ 53 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
59 echo $$xmlpath; \ 54 echo $$xmlpath; \
@@ -62,25 +57,25 @@ diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-util
62 for id in $$ids; do \ 57 for id in $$ids; do \
63 echo '#define HELP_'`echo $$docid`'_'`echo $$id \ 58 echo '#define HELP_'`echo $$docid`'_'`echo $$id \
64 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ 59 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
65@@ -180,7 +180,7 @@ 60@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
66 echo "The file '$(_skcontentslist)' does not exist." >&2; \ 61 echo "The file '$(_skcontentslist)' does not exist." >&2; \
67 echo "Please check your ScrollKeeper installation." >&2; \ 62 echo "Please check your ScrollKeeper installation." >&2; \
68 exit 1; } 63 exit 1; }
69- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } 64- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
70+ xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } 65+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
71 66
72 ## @ _DOC_OMF_HTML 67 ## @ _DOC_OMF_HTML
73 ## The OMF files for HTML output 68 ## The OMF files for HTML output
74@@ -195,7 +195,7 @@ 69@@ -212,7 +212,7 @@ if ENABLE_SK
75 echo "Please check your ScrollKeeper installation." >&2; \ 70 echo "Please check your ScrollKeeper installation." >&2; \
76 exit 1; } 71 exit 1; }
77 endif 72 endif
78- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } 73- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
79+ xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } 74+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
80 75
81 ## @ _DOC_OMF_ALL 76 ## @ _DOC_OMF_ALL
82 ## All OMF output files to be built 77 ## All OMF output files to be built
83@@ -250,7 +250,7 @@ 78@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
84 ## All HTML documentation in the C locale 79 ## All HTML documentation in the C locale
85 # FIXME: probably have to shell escape to determine the file names 80 # FIXME: probably have to shell escape to determine the file names
86 _DOC_C_HTML = $(foreach f, \ 81 _DOC_C_HTML = $(foreach f, \
@@ -89,12 +84,12 @@ diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-util
89 --stringparam db.chunk.basename "$(DOC_MODULE)" \ 84 --stringparam db.chunk.basename "$(DOC_MODULE)" \
90 $(_chunks) "C/$(DOC_MODULE).xml"), \ 85 $(_chunks) "C/$(DOC_MODULE).xml"), \
91 C/$(f).xhtml) 86 C/$(f).xhtml)
92@@ -379,7 +379,7 @@ 87@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
93 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) 88 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
94 89
95 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) 90 $(_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,$@) 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,$@)
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,$@) 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,$@)
98 93
99 94
100 ################################################################################ 95 ################################################################################
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
index e93f5849d2..bde7b89147 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
@@ -1,12 +1,14 @@
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 = "r8" 4PR = "r0"
5
6GNOME_COMPRESS_TYPE = "xz"
5 7
6SRC_URI += "file://xsltproc_nonet.patch \ 8SRC_URI += "file://xsltproc_nonet.patch \
7 file://use-usr-bin-env-for-python-in-xml2po.patch \ 9 file://use-usr-bin-env-for-python-in-xml2po.patch \
8 file://sysrooted-pkg-config.patch \ 10 file://sysrooted-pkg-config.patch \
9 " 11 "
10 12
11SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391" 13SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5"
12SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf" 14SRC_URI[archive.sha256sum] = "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"