diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2011-05-04 21:23:35 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 11:54:46 +0100 |
| commit | c6f791853acf8fec922c1ebcf62195be2615870d (patch) | |
| tree | d01536d649e787981847b43b35b5d9c2b616f2a0 | |
| parent | f680b0e81c7d40b42f1fb3bd3f0790d3b89ed563 (diff) | |
| download | openembedded-core-c6f791853acf8fec922c1ebcf62195be2615870d.tar.gz openembedded-core-c6f791853acf8fec922c1ebcf62195be2615870d.tar.bz2 openembedded-core-c6f791853acf8fec922c1ebcf62195be2615870d.zip | |
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.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-doc-utils.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb | 4 |
3 files changed, 38 insertions, 2 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.5.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb index 94b5aecef6..1c864b2296 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,9 @@ require gnome-doc-utils.inc LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" -PR = "r0" +PR = "r1" + +SRC_URI += "file://xsltproc_nonet.patch" SRC_URI[archive.md5sum] = "3aa1f651834714090cdbf898ec090a98" SRC_URI[archive.sha256sum] = "08d99b8ab813fadd3407873e4a30282debce92e22eb1b45430a8bb9c120e2130" |