diff options
author | Scott Garman <scott.a.garman@intel.com> | 2011-05-04 21:23:35 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-05-05 15:47:20 -0700 |
commit | 6244cbc945b230a705dac3783370e0c890e1260c (patch) | |
tree | 8120ef1223b8a676703b24f6e1f0e1e04b378693 /meta | |
parent | f76a807400f08d235549a8f98edddd036ea9a42c (diff) | |
download | poky-6244cbc945b230a705dac3783370e0c890e1260c.tar.gz |
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>
Diffstat (limited to 'meta')
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 @@ | |||
1 | LICENSE = "GPL LGPL" | 1 | LICENSE = "GPL LGPL" |
2 | DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native" | 2 | DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native" |
3 | DEPENDS_virtclass-native = "libxml2-native libxslt-native" | 3 | DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native" |
4 | 4 | ||
5 | inherit gnome gettext | 5 | inherit gnome gettext |
6 | 6 | ||
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 @@ | |||
1 | This adds the -nonet option to xsltproc invocations, which fixes | ||
2 | compile errors when building gnome-doc-xslt-de.omf. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
8 | diff -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 | ||
10 | +++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am 2011-05-04 21:03:29.382491164 -0700 | ||
11 | @@ -21,14 +21,14 @@ | ||
12 | |||
13 | $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl | ||
14 | $(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ | ||
15 | - | xsltproc -o "$@" \ | ||
16 | + | xsltproc -nonet -o "$@" \ | ||
17 | --stringparam basename "$(basename $(notdir $@))" \ | ||
18 | --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ | ||
19 | "$(srcdir)/xsldoc-fill.xsl" - | ||
20 | |||
21 | $(xsldoc_xmls): xsldoc-docbook.xsl | ||
22 | $(xsldoc_xmls): C/%.xml : C/%.xsldoc | ||
23 | - xsltproc -o "$@" \ | ||
24 | + xsltproc -nonet -o "$@" \ | ||
25 | --stringparam basename "$(basename $(notdir $@))" \ | ||
26 | --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ | ||
27 | "$(srcdir)/xsldoc-docbook.xsl" "$<" | ||
28 | @@ -75,4 +75,4 @@ | ||
29 | DOC_MODULE = gnome-doc-xslt | ||
30 | DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base)) | ||
31 | |||
32 | -DOC_LINGUAS = de | ||
33 | \ No newline at end of file | ||
34 | +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 @@ | |||
1 | require gnome-doc-utils.inc | ||
2 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ | ||
3 | file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
4 | PR = "r0" | ||
5 | |||
6 | SRC_URI[archive.md5sum] = "6872b68dd081fc033e07d5877b4c0645" | ||
7 | 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 @@ | |||
1 | require gnome-doc-utils.inc | ||
2 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ | ||
3 | file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
4 | PR = "r1" | ||
5 | |||
6 | SRC_URI += "file://xsltproc_nonet.patch" | ||
7 | |||
8 | SRC_URI[archive.md5sum] = "3aa1f651834714090cdbf898ec090a98" | ||
9 | SRC_URI[archive.sha256sum] = "08d99b8ab813fadd3407873e4a30282debce92e22eb1b45430a8bb9c120e2130" | ||