diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-05 16:50:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 11:56:41 +0000 |
commit | b234a4ed4d6a9c2e00f5fa38cf04867c7ada24a0 (patch) | |
tree | a373cd9e3467350528e23403e4fe406b205f0e87 /meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch | |
parent | 3cce2d1c36b0859186139d650fd50d2a56e91abd (diff) | |
download | openembedded-core-contrib-b234a4ed4d6a9c2e00f5fa38cf04867c7ada24a0.tar.gz |
texinfo: update to 6.7
Drop 0001-Unset-need_charset_alias-when-building-for-musl.patch
as the problematic code is gone.
Rebase the other patches.
License-Update: http links changed to https
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 23 |
1 files changed, 12 insertions, 11 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 f4184399c7..0d6bbafadd 100644 --- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch @@ -1,4 +1,4 @@ -From e89b1c57d76f5cf5acbb0d0187374f7a77bce1e2 Mon Sep 17 00:00:00 2001 +From 63a803ead3656353329a801846a9a3beb7210c46 Mon Sep 17 00:00:00 2001 From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> Date: Tue, 29 Nov 2016 13:43:24 -0600 Subject: [PATCH] dont-depend-on-help2man @@ -7,29 +7,30 @@ Upstream-Status: Inappropriate Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> + --- 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 39db834..1bb2a4f +index 732833e..041cb9b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -38,7 +38,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ +@@ -37,7 +37,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ # Include our texinfo.tex, not Automake's. EXTRA_DIST = epsf.tex texinfo.tex \ fdl.texi \ - $(man_MANS) $(TXI_XLATE) \ + $(TXI_XLATE) \ - $(refcard_files) texinfo-tex-test.texi \ + $(refcard_files) \ + texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ texinfo-ja.tex short-sample-ja.texi - diff --git a/man/Makefile.am b/man/Makefile.am -index 6bfcb3d..a820c96 +index d0cd72c..a19e52a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am -@@ -13,24 +13,24 @@ +@@ -11,27 +11,27 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # These are generated using help2man. @@ -47,10 +48,13 @@ index 6bfcb3d..a820c96 -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 + pod2texi.1: $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl + $(POD2MAN) $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl >"$@" + + # 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 @@ -60,6 +64,3 @@ index 6bfcb3d..a820c96 # Maintainers should be able to regenerate. MAINTAINERCLEANFILES = $(man_MANS) --- -2.9.3 - |