gnome-doc-utils: Add -nonet option to xsltproc

This adds the -nonet option to xsltproc invocations, which fixes
compile errors when building gnome-doc-xslt-de.omf.

Also add intltool-native to DEPENDS, which was discovered to be
needed when building this recipe.

(From OE-Core rev: c6f791853acf8fec922c1ebcf62195be2615870d)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 44 insertions, 8 deletions

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 30cff36ddd..903d0806fa 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -1,6 +1,6 @@
 LICENSE = "GPL LGPL"
 DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native"
-DEPENDS_virtclass-native = "libxml2-native libxslt-native"
+DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native"
 
 inherit gnome gettext
 
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..73d22bfc99
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -0,0 +1,34 @@
+This adds the -nonet option to xsltproc invocations, which fixes
+compile errors when building gnome-doc-xslt-de.omf.
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20.5/doc/xslt/Makefile.am
+--- gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am   2011-03-22 06:56:17.000000000 -0700
++++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am 2011-05-04 21:03:29.382491164 -0700
+@@ -21,14 +21,14 @@
+ 
+ $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
+        $(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
+-       | xsltproc -o "$@" \
++       | xsltproc -nonet -o "$@" \
+        --stringparam basename "$(basename $(notdir $@))" \
+        --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
+        "$(srcdir)/xsldoc-fill.xsl" -
+ 
+ $(xsldoc_xmls): xsldoc-docbook.xsl
+ $(xsldoc_xmls): C/%.xml : C/%.xsldoc
+-       xsltproc -o "$@" \
++       xsltproc -nonet -o "$@" \
+        --stringparam basename "$(basename $(notdir $@))" \
+        --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
+        "$(srcdir)/xsldoc-docbook.xsl" "$<"
+@@ -75,4 +75,4 @@
+ DOC_MODULE = gnome-doc-xslt
+ DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base))
+ 
+-DOC_LINGUAS = de
+\ No newline at end of file
++DOC_LINGUAS = de
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.4.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.4.bb
deleted file mode 100644
index a8cbcf0fec..0000000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require gnome-doc-utils.inc
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
-                    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r0"
-
-SRC_URI[archive.md5sum] = "6872b68dd081fc033e07d5877b4c0645"
-SRC_URI[archive.sha256sum] = "97c6465ffb15969a9fe1761f16f30c1028977fb24ecda89a0b479170f6412e4d"
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
new file mode 100644
index 0000000000..1c864b2296
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb
@@ -0,0 +1,9 @@
+require gnome-doc-utils.inc
+LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
+                    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
+PR = "r1"
+
+SRC_URI += "file://xsltproc_nonet.patch"
+
+SRC_URI[archive.md5sum] = "3aa1f651834714090cdbf898ec090a98"
+SRC_URI[archive.sha256sum] = "08d99b8ab813fadd3407873e4a30282debce92e22eb1b45430a8bb9c120e2130"