diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-06 14:41:35 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:04:21 -0700 |
commit | 156a62b25ce95a67ff7633080dc9bd4710dc4b79 (patch) | |
tree | 59246ccd1f693dda3d16fb5f66e9e9681519f4fc /meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch | |
parent | f798df217ff41b4edb2bc83dda2e02e112b9ead4 (diff) | |
download | openembedded-core-contrib-156a62b25ce95a67ff7633080dc9bd4710dc4b79.tar.gz |
texinfo: Upgrade 5.2 -> 6.0
* Remove texinfo-4.13a-powerpc.patch (already in upstream)
* Rebase texinfo-4.12-zlib.patch, dont-depend-on-help2man.patch
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch')
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch index 876e0d0ad9..0ce47ecdb9 100644 --- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch @@ -1,10 +1,21 @@ +From 6f1f3912fcb900b3a3e6cbe3360306fade333497 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Thu, 6 Aug 2015 14:55:08 +0300 +Subject: [PATCH] dont-depend-on-help2man + Upstream-Status: Inappropriate Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am ---- texinfo-5.1/doc/Makefile.am 2013-02-23 02:11:25.000000000 +0200 -+++ texinfo-5.1/doc/Makefile.am 2013-08-20 01:43:55.622376198 +0300 -@@ -40,7 +40,7 @@ +--- + doc/Makefile.am | 2 +- + man/Makefile.am | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 7198a6b..4bba550 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ # Include our texinfo.tex, not Automake's. EXTRA_DIST = epsf.tex texinfo.tex \ fdl.texi \ @@ -13,37 +24,41 @@ diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am $(refcard_files) if INSTALL_WARNINGS -diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am ---- texinfo-5.1/man/Makefile.am 2013-02-23 02:11:25.000000000 +0200 -+++ texinfo-5.1/man/Makefile.am 2013-08-20 01:53:40.542395884 +0300 +diff --git a/man/Makefile.am b/man/Makefile.am +index a08d603..bdfc9a4 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am @@ -13,24 +13,24 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - + # These are generated using help2man. -man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 +#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 - + # These require the build in info/, thus can't do if we failed to find a # terminal library. if HAVE_TERMLIBS --man_MANS += info.1 infokey.1 -+#man_MANS += info.1 infokey.1 +-man_MANS += info.1 ++#man_MANS += info.1 endif - + # These are hand-written. -man_MANS += info.5 texinfo.5 +#man_MANS += info.5 texinfo.5 - + # This is generated by pod2man, but let's just run it by hand. -man_MANS += pod2texi.1 +#man_MANS += pod2texi.1 - + # These are just .so's to the common program. -man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 +#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 - + -EXTRA_DIST = $(man_MANS) ginfo.h2m +EXTRA_DIST = ginfo.h2m - + # Maintainers should be able to regenerate. MAINTAINERCLEANFILES = $(man_MANS) +-- +2.1.4 + |