summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gnome')
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils.inc29
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch35
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch30
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch95
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb12
5 files changed, 0 insertions, 201 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
deleted file mode 100644
index 0d212c738e..0000000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "A collection of documentation utilities for the Gnome project"
2DESCRIPTION = "The GNOME Documentation Build Utilities (gnome-doc- \
3utils) were created to make it easier for application developers to \
4include and create documentation in their releases. They include the \
5xml2po tool which makes it easier to translate and keep up to date \
6translations of documentation."
7LICENSE = "GPLv2 & LGPLv2.1"
8DEPENDS = "intltool-native libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
9
10inherit gnomebase gettext python-dir pythonnative autotools-brokensep
11
12CLEANBROKEN = "1"
13
14EXTRA_OECONF += "--disable-scrollkeeper"
15
16do_install_append() {
17 chown -R root:root ${D}
18}
19
20do_install_append_class-native () {
21 sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' ${D}${bindir}/xml2po
22}
23
24FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*"
25
26RDEPENDS_${PN} = "bash"
27RDEPENDS_${PN}_class-native = ""
28
29BBCLASSEXTEND = "native"
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
deleted file mode 100644
index 416d698641..0000000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1In cross environment we have to prepend the sysroot to the path found by
2pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
3it ends up using the files from host system. Now usually people have gnome installed
4so the build succeeds but if you dont have gnome installed on build host then
5it wont find the files on host system and packages using gnome-doc-utils wont
6compile.
7
8This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
9will be empty
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
14
15Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
16===================================================================
17--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
18+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
19@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
20 _xml2po ?= `which xml2po`
21 _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
22
23-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
24-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
25-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
26-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
27-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
28+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
29+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
30+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
31+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
32+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
33
34 if ENABLE_SK
35 _ENABLE_SK = true
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
deleted file mode 100644
index 0e196c0634..0000000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1We can't use #!/full/path/to/python -u as this can be longer than shebang
2allows for. In order to be appropraite for upstream more work would be
3needed to make sure that the main xml2po code doesn't rely on python
4being invoked with -u (force stdin/out/err to be used raw).
5
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
10===================================================================
11--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am
12+++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
13@@ -7,7 +7,6 @@ CLEANFILES = xml2po
14
15 xml2po: xml2po.py.in
16 $(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
17- -e "s+^#!.*python.*+#!$(PYTHON)+" \
18 < $(srcdir)/xml2po.py.in > xml2po
19 $(AM_V_at)chmod +x xml2po
20
21Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
22===================================================================
23--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in
24+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
25@@ -1,4 +1,4 @@
26-#!/usr/bin/python -u
27+#!/usr/bin/env python
28 # -*- encoding: utf-8 -*-
29 # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
30 # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
deleted file mode 100644
index 9346494e95..0000000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ /dev/null
@@ -1,95 +0,0 @@
1This adds the -nonet option to xsltproc invocations, which fixes
2compile errors when building the gnome-doc-utils docs.
3
4Upstream-Status: Inappropriate [configuration]
5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
7
8Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
9===================================================================
10--- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am
11+++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
12@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls)
13
14 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
15 $(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
16- | xsltproc -o "$@" \
17+ | xsltproc -nonet -o "$@" \
18 --stringparam basename "$(basename $(notdir $@))" \
19 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
20 "$(srcdir)/xsldoc-fill.xsl" -
21
22 $(xsldoc_xmls): xsldoc-docbook.xsl
23 $(xsldoc_xmls): C/%.xml : C/%.xsldoc
24- $(AM_V_GEN)xsltproc -o "$@" \
25+ $(AM_V_GEN)xsltproc -nonet -o "$@" \
26 --stringparam basename "$(basename $(notdir $@))" \
27 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
28 "$(srcdir)/xsldoc-docbook.xsl" "$<"
29@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes:
30 gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
31 @echo "Running xsldoc checks";
32 @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
33- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
34+ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
35
36 .PHONY: clean-xsldoc
37 clean-local: clean_xsldoc
38Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
39===================================================================
40--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
41+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
42@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
43 list='$(DOC_H_DOCS)'; for doc in $$list; do \
44 xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
45 if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
46- xsltproc --path "$$xmlpath" $(_credits) $$doc; \
47+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \
48 done | sort | uniq \
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}}' \
50 | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
51@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
52 docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
53 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
54 echo $$xmlpath; \
55- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
56+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
57 for id in $$ids; do \
58 echo '#define HELP_'`echo $$docid`'_'`echo $$id \
59 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
60@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
61 echo "The file '$(_skcontentslist)' does not exist." >&2; \
62 echo "Please check your ScrollKeeper installation." >&2; \
63 exit 1; }
64- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
65+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
66
67 ## @ _DOC_OMF_HTML
68 ## The OMF files for HTML output
69@@ -212,7 +212,7 @@ if ENABLE_SK
70 echo "Please check your ScrollKeeper installation." >&2; \
71 exit 1; }
72 endif
73- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
74+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
75
76 ## @ _DOC_OMF_ALL
77 ## All OMF output files to be built
78@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
79 ## All HTML documentation in the C locale
80 # FIXME: probably have to shell escape to determine the file names
81 _DOC_C_HTML = $(foreach f, \
82- $(shell xsltproc --xinclude \
83+ $(shell xsltproc -nonet --xinclude \
84 --stringparam db.chunk.basename "$(DOC_MODULE)" \
85 $(_chunks) "C/$(DOC_MODULE).xml"), \
86 C/$(f).xhtml)
87@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
88 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
89
90 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
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,$@)
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,$@)
93
94
95 ################################################################################
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
deleted file mode 100644
index ed01ea7b53..0000000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require gnome-doc-utils.inc
2LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
3 file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
4
5SRC_URI += "file://xsltproc_nonet.patch \
6 file://use-usr-bin-env-for-python-in-xml2po.patch \
7 file://sysrooted-pkg-config.patch \
8 file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
9 "
10
11SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5"
12SRC_URI[archive.sha256sum] = "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-11 06:02:57 +0000