diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils')
4 files changed, 40 insertions, 160 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch new file mode 100644 index 000000000..4cfcabd38 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch @@ -0,0 +1,40 @@ +From 426e38468463a4abb495cf6a269b9635b2107519 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 17 May 2016 13:51:24 +0300 +Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib + +This avoids + error: m4_copy: won't overwrite defined macro: glib_DEFUN + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [No upstream] +--- + m4/glib-gettext.m4 | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4 +index 81f8fd2..e2b142b 100644 +--- a/m4/glib-gettext.m4 ++++ b/m4/glib-gettext.m4 +@@ -310,7 +310,7 @@ msgstr "" + # on various variables needed by the Makefile.in.in installed by + # glib-gettextize. + dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], ++AU_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + +@@ -381,7 +381,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++ ] ++ [[$0: This macro is deprecated. You should use upstream gettext instead.]]) + + # AX_GLIB_DEFINE_LOCALEDIR(VARIABLE) + # ------------------------------- +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch deleted file mode 100644 index 416d69864..000000000 --- a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch +++ /dev/null @@ -1,35 +0,0 @@ -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make -=================================================================== ---- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make -+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make -@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ - _xml2po ?= `which xml2po` - _xml2po_mode = $(if $(DOC_ID),mallard,docbook) - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch deleted file mode 100644 index 0e196c063..000000000 --- a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch +++ /dev/null @@ -1,30 +0,0 @@ -We can't use #!/full/path/to/python -u as this can be longer than shebang -allows for. In order to be appropraite for upstream more work would be -needed to make sure that the main xml2po code doesn't rely on python -being invoked with -u (force stdin/out/err to be used raw). - -Upstream-Status: Inappropriate [Would break behavior on Windows] -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am -=================================================================== ---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am -+++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am -@@ -7,7 +7,6 @@ CLEANFILES = xml2po - - xml2po: xml2po.py.in - $(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \ -- -e "s+^#!.*python.*+#!$(PYTHON)+" \ - < $(srcdir)/xml2po.py.in > xml2po - $(AM_V_at)chmod +x xml2po - -Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in -=================================================================== ---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in -+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in -@@ -1,4 +1,4 @@ --#!/usr/bin/python -u -+#!/usr/bin/env python - # -*- encoding: utf-8 -*- - # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>. - # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>. diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch deleted file mode 100644 index 9346494e9..000000000 --- a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch +++ /dev/null @@ -1,95 +0,0 @@ -This adds the -nonet option to xsltproc invocations, which fixes -compile errors when building the gnome-doc-utils docs. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Scott Garman <scott.a.garman@intel.com> -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am -=================================================================== ---- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am -+++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am -@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls) - - $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl - $(AM_V_GEN)$(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 -- $(AM_V_GEN)xsltproc -o "$@" \ -+ $(AM_V_GEN)xsltproc -nonet -o "$@" \ - --stringparam basename "$(basename $(notdir $@))" \ - --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ - "$(srcdir)/xsldoc-docbook.xsl" "$<" -@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes: - gnome-doc-xslt-check-xsldoc: $(xsldoc_docs) - @echo "Running xsldoc checks"; - @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \ -- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null -+ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null - - .PHONY: clean-xsldoc - clean-local: clean_xsldoc -Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make -=================================================================== ---- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make -+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make -@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ -- xsltproc --path "$$xmlpath" $(_credits) $$doc; \ -+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \ - done | sort | uniq \ - | 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}}' \ - | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp -@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); - docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ - echo $$xmlpath; \ -- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ -+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ - for id in $$ids; do \ - echo '#define HELP_'`echo $$docid`'_'`echo $$id \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ -@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : % - echo "The file '$(_skcontentslist)' does not exist." >&2; \ - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } -- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } -+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } - - ## @ _DOC_OMF_HTML - ## The OMF files for HTML output -@@ -212,7 +212,7 @@ if ENABLE_SK - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } - endif -- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } -+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } - - ## @ _DOC_OMF_ALL - ## All OMF output files to be built -@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES), - ## All HTML documentation in the C locale - # FIXME: probably have to shell escape to determine the file names - _DOC_C_HTML = $(foreach f, \ -- $(shell xsltproc --xinclude \ -+ $(shell xsltproc -nonet --xinclude \ - --stringparam db.chunk.basename "$(DOC_MODULE)" \ - $(_chunks) "C/$(DOC_MODULE).xml"), \ - C/$(f).xhtml) -@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML, - _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) - - $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) -- $(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,$@) -+ $(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,$@) - - - ################################################################################ |
