From f85cf4b351e877b2679c85832d45ac398ab29b51 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 27 Dec 2013 10:10:48 -0800 Subject: texinfo: Update to 5.2 Removed a backported patch Signed-off-by: Saul Wold --- .../texinfo/texinfo-5.1/disable-native-tools.patch | 43 ----- .../texinfo-5.1/dont-depend-on-help2man.patch | 49 ------ .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 ------ .../texinfo/texinfo-5.1/link-zip.patch | 16 -- .../texinfo/texinfo-5.1/texinfo-4.12-zlib.patch | 187 --------------------- .../texinfo-5.1/texinfo-4.13a-powerpc.patch | 14 -- .../texinfo/texinfo-5.1/use_host_makedoc.patch | 17 -- .../texinfo/texinfo/disable-native-tools.patch | 43 +++++ .../texinfo/texinfo/dont-depend-on-help2man.patch | 49 ++++++ .../texinfo/enumerate_greater_than_ten.patch | 51 ++++++ .../texinfo/texinfo/link-zip.patch | 16 ++ .../texinfo/texinfo/texinfo-4.12-zlib.patch | 187 +++++++++++++++++++++ .../texinfo/texinfo/texinfo-4.13a-powerpc.patch | 14 ++ .../texinfo/texinfo/use_host_makedoc.patch | 17 ++ meta/recipes-extended/texinfo/texinfo_5.1.bb | 63 ------- meta/recipes-extended/texinfo/texinfo_5.2.bb | 62 +++++++ 16 files changed, 439 insertions(+), 440 deletions(-) delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/link-zip.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch create mode 100644 meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch delete mode 100644 meta/recipes-extended/texinfo/texinfo_5.1.bb create mode 100644 meta/recipes-extended/texinfo/texinfo_5.2.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch deleted file mode 100644 index ab6f1658aa..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch +++ /dev/null @@ -1,43 +0,0 @@ -We already DEPEND on the native texinfo being present before building so -there isn't any need to try and build the required native texinfo binaries -before cross-compiling. This simplifies the recipe somewhat! - -Upstream-Status: Inappropriate oe specific - -Signed-off-by: Joshua Lock - -Index: texinfo-4.13/configure.ac -=================================================================== ---- texinfo-4.13.orig/configure.ac -+++ texinfo-4.13/configure.ac -@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD - # $native_tools is also added to SUBDIRS in the main Makefile.am, - # so that make compiles the native tools first. - # --if test "$cross_compiling" = no; then -- native_tools= --else -- native_tools=tools -- test -d "$native_tools" || mkdir "$native_tools" -- confdir=`(cd "$srcdir";pwd)` -- # Make sure the secondary configure won't fail with -- # "error: source directory already configured". -- rm -f config.status -- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) -- cd "$native_tools" || exit 1 -- # Run secondary configure in alternate environment or -- # it gets the wrong CC etc. -- # env -i gives this build host configure a clean environment; -- # consequently, we have to re-initialize $PATH. -- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ -- PATH="$PATH" \ -- tools_only=1 \ -- ${confdir}/configure --build=${build} --host=${build} \ -- --disable-rpath --disable-nls -- cd .. || exit 1 -- AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) --fi -+native_tools= - AC_SUBST(native_tools) - AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) - diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch deleted file mode 100644 index 6e216dac78..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream-Status: Inappropŕiate - -Signed-off-by: Marko Lindqvist -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 @@ - # Include our texinfo.tex, not Automake's. - EXTRA_DIST = epsf.tex texinfo.tex \ - fdl.texi \ -- $(man_MANS) $(TXI_XLATE) \ -+ $(TXI_XLATE) \ - $(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 -@@ -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 - 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) diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch b/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch deleted file mode 100644 index ef69143bf3..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Thu, 15 Aug 2013 23:49:47 -0700 -Subject: [PATCH] handle correctly @enumerate specification greater than 10 - -Upstream-Status: Backport - -Revision: 5270 - http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270 -Author: pertusus -Date: 2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013) -Log Message: ------------ - * tp/Common.pm (enumerate_item_representation), Texinfo/Parser.pm: - handle correctly @enumerate specification greater than 10. Report - from Dmitry Shachnev. - ---- - tp/Texinfo/Common.pm | 2 +- - tp/Texinfo/Parser.pm | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm -index 8aee9f7..bdffeee 100644 ---- a/tp/Texinfo/Common.pm -+++ b/tp/Texinfo/Common.pm -@@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$) - my $specification = shift; - my $number = shift; - -- if ($specification =~ /^[0-9]$/) { -+ if ($specification =~ /^[0-9]+$/) { - return $specification + $number -1; - } - -diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm -index cf8fa72..8e845e9 100644 ---- a/tp/Texinfo/Parser.pm -+++ b/tp/Texinfo/Parser.pm -@@ -2973,7 +2973,7 @@ sub _end_line($$$) - $current->{'cmdname'}); - } - my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0]; -- if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) { -+ if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) { - $self->_command_error($current, $line_nr, - $self->__("bad argument to \@%s"), - $current->{'cmdname'}); --- -1.7.1 - diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch b/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch deleted file mode 100644 index 0b6e9fd7ea..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch +++ /dev/null @@ -1,16 +0,0 @@ -install-info uses symbols from zlib so must link against it. - -Upstream-Status: Pending - -Signed-off-by: Joshua Lock - -Index: texinfo-5.1/install-info/Makefile.am -=================================================================== ---- texinfo-5.1.orig/install-info/Makefile.am -+++ texinfo-5.1/install-info/Makefile.am -@@ -34,4 +34,4 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/gnulib/lib \ - -I$(top_builddir)/gnulib/lib \ - -DLOCALEDIR=\"$(localedir)\" --LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch deleted file mode 100644 index bebcbdf8da..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch +++ /dev/null @@ -1,187 +0,0 @@ -Upstream-Status: Pending - -Index: texinfo-5.1/install-info/Makefile.in -=================================================================== ---- texinfo-5.1.orig/install-info/Makefile.in -+++ texinfo-5.1/install-info/Makefile.in -@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) -Index: texinfo-5.1/install-info/install-info.c -=================================================================== ---- texinfo-5.1.orig/install-info/install-info.c -+++ texinfo-5.1/install-info/install-info.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #define TAB_WIDTH 8 - -@@ -670,7 +671,7 @@ The first time you invoke Info you start - - MAGIC number, not the filename. */ - --FILE * -+void * - open_possibly_compressed_file (char *filename, - void (*create_callback) (char *), - char **opened_filename, char **compression_program, int *is_pipe) -@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil - /* And try opening it again. */ - free (*opened_filename); - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - pfatal_with_name (filename); - } -@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil - - /* Read first few bytes of file rather than relying on the filename. - If the file is shorter than this it can't be usable anyway. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { - /* Empty files don't set errno, so we get something like - "install-info: No error for foo", which is confusing. */ -- if (nread == 0) -+ if (nread >= 0) - fatal (_("%s: empty file"), *opened_filename); - pfatal_with_name (*opened_filename); - } -@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil - - if (*compression_program) - { /* It's compressed, so fclose the file and then open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program," -cd <", *opened_filename); -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - pfatal_with_name (*opened_filename); -- f = popen (command, "r"); -- if (f) -+ p = popen (command, "r"); -+ if (p) - *is_pipe = 1; - else - pfatal_with_name (command); -+ return p; - } - else - { /* It's a plain file, seek back over the magic bytes. */ -- if (fseek (f, 0, 0) < 0) -+ if (gzseek (f, 0, SEEK_SET) < 0) - pfatal_with_name (*opened_filename); --#if O_BINARY -+#if 0 && O_BINARY - /* Since this is a text file, and we opened it in binary mode, - switch back to text mode. */ - f = freopen (*opened_filename, "r", f); -@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep, - char **compression_program) - { - char *real_name; -- FILE *f; -+ void *f; - int pipe_p; - int filled = 0; - int data_size = 8192; -@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep, - - for (;;) - { -- int nread = fread (data + filled, 1, data_size - filled, f); -+ int nread; -+ -+ if (pipe_p) -+ nread = fread (data + filled, 1, data_size - filled, f); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - pfatal_with_name (real_name); - if (nread == 0) -@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep, - if (pipe_p) - pclose (f); - else -- fclose (f); -+ gzclose (f); - - *sizep = filled; - return data; diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch deleted file mode 100644 index 312430f5af..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c ---- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100 -+++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100 -@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil - } - else - { /* It's a plain file, seek back over the magic bytes. */ -- if (gzseek (f, 0, SEEK_SET) < 0) -+ if (gzseek (f, 0, SEEK_SET) == -1) - pfatal_with_name (*opened_filename); - #if 0 && O_BINARY - /* Since this is a text file, and we opened it in binary mode, diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch deleted file mode 100644 index 5b7f32d9a9..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate [cross build specific] - -Signed-off-by: Saul Wold - -Index: texinfo-5.1/info/Makefile.am -=================================================================== ---- texinfo-5.1.orig/info/Makefile.am -+++ texinfo-5.1/info/Makefile.am -@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd - # more than once. - funs.h: makedoc$(EXEEXT) $(cmd_sources) - rm -f $(generated_sources) -- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) -+ makedoc $(cmd_sources) - - # The following hack is necessary to hint make before the automatic - # dependencies are built. diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch new file mode 100644 index 0000000000..ab6f1658aa --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch @@ -0,0 +1,43 @@ +We already DEPEND on the native texinfo being present before building so +there isn't any need to try and build the required native texinfo binaries +before cross-compiling. This simplifies the recipe somewhat! + +Upstream-Status: Inappropriate oe specific + +Signed-off-by: Joshua Lock + +Index: texinfo-4.13/configure.ac +=================================================================== +--- texinfo-4.13.orig/configure.ac ++++ texinfo-4.13/configure.ac +@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD + # $native_tools is also added to SUBDIRS in the main Makefile.am, + # so that make compiles the native tools first. + # +-if test "$cross_compiling" = no; then +- native_tools= +-else +- native_tools=tools +- test -d "$native_tools" || mkdir "$native_tools" +- confdir=`(cd "$srcdir";pwd)` +- # Make sure the secondary configure won't fail with +- # "error: source directory already configured". +- rm -f config.status +- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) +- cd "$native_tools" || exit 1 +- # Run secondary configure in alternate environment or +- # it gets the wrong CC etc. +- # env -i gives this build host configure a clean environment; +- # consequently, we have to re-initialize $PATH. +- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ +- PATH="$PATH" \ +- tools_only=1 \ +- ${confdir}/configure --build=${build} --host=${build} \ +- --disable-rpath --disable-nls +- cd .. || exit 1 +- AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) +-fi ++native_tools= + AC_SUBST(native_tools) + AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) + diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch new file mode 100644 index 0000000000..6e216dac78 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch @@ -0,0 +1,49 @@ +Upstream-Status: Inappropŕiate + +Signed-off-by: Marko Lindqvist +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 @@ + # Include our texinfo.tex, not Automake's. + EXTRA_DIST = epsf.tex texinfo.tex \ + fdl.texi \ +- $(man_MANS) $(TXI_XLATE) \ ++ $(TXI_XLATE) \ + $(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 +@@ -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 + 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) diff --git a/meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch b/meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch new file mode 100644 index 0000000000..ef69143bf3 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch @@ -0,0 +1,51 @@ +From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 15 Aug 2013 23:49:47 -0700 +Subject: [PATCH] handle correctly @enumerate specification greater than 10 + +Upstream-Status: Backport + +Revision: 5270 + http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270 +Author: pertusus +Date: 2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013) +Log Message: +----------- + * tp/Common.pm (enumerate_item_representation), Texinfo/Parser.pm: + handle correctly @enumerate specification greater than 10. Report + from Dmitry Shachnev. + +--- + tp/Texinfo/Common.pm | 2 +- + tp/Texinfo/Parser.pm | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm +index 8aee9f7..bdffeee 100644 +--- a/tp/Texinfo/Common.pm ++++ b/tp/Texinfo/Common.pm +@@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$) + my $specification = shift; + my $number = shift; + +- if ($specification =~ /^[0-9]$/) { ++ if ($specification =~ /^[0-9]+$/) { + return $specification + $number -1; + } + +diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm +index cf8fa72..8e845e9 100644 +--- a/tp/Texinfo/Parser.pm ++++ b/tp/Texinfo/Parser.pm +@@ -2973,7 +2973,7 @@ sub _end_line($$$) + $current->{'cmdname'}); + } + my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0]; +- if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) { ++ if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) { + $self->_command_error($current, $line_nr, + $self->__("bad argument to \@%s"), + $current->{'cmdname'}); +-- +1.7.1 + diff --git a/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/meta/recipes-extended/texinfo/texinfo/link-zip.patch new file mode 100644 index 0000000000..0b6e9fd7ea --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/link-zip.patch @@ -0,0 +1,16 @@ +install-info uses symbols from zlib so must link against it. + +Upstream-Status: Pending + +Signed-off-by: Joshua Lock + +Index: texinfo-5.1/install-info/Makefile.am +=================================================================== +--- texinfo-5.1.orig/install-info/Makefile.am ++++ texinfo-5.1/install-info/Makefile.am +@@ -34,4 +34,4 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/gnulib/lib \ + -I$(top_builddir)/gnulib/lib \ + -DLOCALEDIR=\"$(localedir)\" +-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) ++LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch new file mode 100644 index 0000000000..bebcbdf8da --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch @@ -0,0 +1,187 @@ +Upstream-Status: Pending + +Index: texinfo-5.1/install-info/Makefile.in +=================================================================== +--- texinfo-5.1.orig/install-info/Makefile.in ++++ texinfo-5.1/install-info/Makefile.in +@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) + am_ginstall_info_OBJECTS = install-info.$(OBJEXT) + ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) +-ginstall_info_LDADD = $(LDADD) ++ginstall_info_LDADD = $(LDADD) -lz + am__DEPENDENCIES_1 = + ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ + $(am__DEPENDENCIES_1) +Index: texinfo-5.1/install-info/install-info.c +=================================================================== +--- texinfo-5.1.orig/install-info/install-info.c ++++ texinfo-5.1/install-info/install-info.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #define TAB_WIDTH 8 + +@@ -670,7 +671,7 @@ The first time you invoke Info you start + + MAGIC number, not the filename. */ + +-FILE * ++void * + open_possibly_compressed_file (char *filename, + void (*create_callback) (char *), + char **opened_filename, char **compression_program, int *is_pipe) +@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil + char *local_opened_filename, *local_compression_program; + int nread; + char data[13]; +- FILE *f; ++ gzFile *f; + + /* We let them pass NULL if they don't want this info, but it's easier + to always determine it. */ +@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil + opened_filename = &local_opened_filename; + + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + { + *opened_filename = concat (filename, ".gz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".xz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".bz2", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".lz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".lzma", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + #ifdef __MSDOS__ + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".igz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".inz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + #endif /* __MSDOS__ */ + if (!f) +@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil + /* And try opening it again. */ + free (*opened_filename); + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + pfatal_with_name (filename); + } +@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil + + /* Read first few bytes of file rather than relying on the filename. + If the file is shorter than this it can't be usable anyway. */ +- nread = fread (data, sizeof (data), 1, f); +- if (nread != 1) ++ nread = gzread (f, data, sizeof (data)); ++ if (nread != sizeof (data)) + { + /* Empty files don't set errno, so we get something like + "install-info: No error for foo", which is confusing. */ +- if (nread == 0) ++ if (nread >= 0) + fatal (_("%s: empty file"), *opened_filename); + pfatal_with_name (*opened_filename); + } +@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil + + if (*compression_program) + { /* It's compressed, so fclose the file and then open a pipe. */ ++ FILE *p; + char *command = concat (*compression_program," -cd <", *opened_filename); +- if (fclose (f) < 0) ++ if (gzclose (f) < 0) + pfatal_with_name (*opened_filename); +- f = popen (command, "r"); +- if (f) ++ p = popen (command, "r"); ++ if (p) + *is_pipe = 1; + else + pfatal_with_name (command); ++ return p; + } + else + { /* It's a plain file, seek back over the magic bytes. */ +- if (fseek (f, 0, 0) < 0) ++ if (gzseek (f, 0, SEEK_SET) < 0) + pfatal_with_name (*opened_filename); +-#if O_BINARY ++#if 0 && O_BINARY + /* Since this is a text file, and we opened it in binary mode, + switch back to text mode. */ + f = freopen (*opened_filename, "r", f); +@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep, + char **compression_program) + { + char *real_name; +- FILE *f; ++ void *f; + int pipe_p; + int filled = 0; + int data_size = 8192; +@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep, + + for (;;) + { +- int nread = fread (data + filled, 1, data_size - filled, f); ++ int nread; ++ ++ if (pipe_p) ++ nread = fread (data + filled, 1, data_size - filled, f); ++ else ++ nread = gzread (f, data + filled, data_size - filled); + if (nread < 0) + pfatal_with_name (real_name); + if (nread == 0) +@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep, + if (pipe_p) + pclose (f); + else +- fclose (f); ++ gzclose (f); + + *sizep = filled; + return data; diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch new file mode 100644 index 0000000000..312430f5af --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch @@ -0,0 +1,14 @@ +Upstream-Status: Pending + +diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c +--- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100 ++++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100 +@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil + } + else + { /* It's a plain file, seek back over the magic bytes. */ +- if (gzseek (f, 0, SEEK_SET) < 0) ++ if (gzseek (f, 0, SEEK_SET) == -1) + pfatal_with_name (*opened_filename); + #if 0 && O_BINARY + /* Since this is a text file, and we opened it in binary mode, diff --git a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch new file mode 100644 index 0000000000..5b7f32d9a9 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Saul Wold + +Index: texinfo-5.1/info/Makefile.am +=================================================================== +--- texinfo-5.1.orig/info/Makefile.am ++++ texinfo-5.1/info/Makefile.am +@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd + # more than once. + funs.h: makedoc$(EXEEXT) $(cmd_sources) + rm -f $(generated_sources) +- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) ++ makedoc $(cmd_sources) + + # The following hack is necessary to hint make before the automatic + # dependencies are built. diff --git a/meta/recipes-extended/texinfo/texinfo_5.1.bb b/meta/recipes-extended/texinfo/texinfo_5.1.bb deleted file mode 100644 index 9a56a1c070..0000000000 --- a/meta/recipes-extended/texinfo/texinfo_5.1.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "Documentation system for on-line information and printed output" -DESCRIPTION = "Texinfo is a documentation system that can produce both \ -online information and printed output from a single source file. The \ -GNU Project uses the Texinfo file format for most of its documentation." -HOMEPAGE = "http://www.gnu.org/software/texinfo/" -SECTION = "console/utils" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "zlib ncurses texinfo-native" -DEPENDS_class-native = "zlib-native ncurses-native" - -TARGET_PATCH = "file://use_host_makedoc.patch" -TARGET_PATCH_class-native = "" - -SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ - file://texinfo-4.13a-powerpc.patch \ - file://disable-native-tools.patch \ - file://link-zip.patch \ - file://dont-depend-on-help2man.patch \ - file://enumerate_greater_than_ten.patch \ - ${TARGET_PATCH} \ - " - -SRC_URI[md5sum] = "54e250014fe698fb4832016158747c03" -SRC_URI[sha256sum] = "50e8067f9758bb2bf175b69600082ac4a27c464cb4bcd48a578edd3127216600" - -S = "${WORKDIR}/${BP}" -tex_texinfo = "texmf/tex/texinfo" - -inherit gettext autotools - -do_compile_prepend() { - if [ -d tools ];then - oe_runmake -C tools/gnulib/lib - fi -} - -do_install_append() { - mkdir -p ${D}${datadir}/${tex_texinfo} - install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi -} - -do_install_append_class-native() { - install -m 755 info/makedoc ${D}${bindir} -} - -PACKAGES += "info info-doc" - -FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" -FILES_info-doc = "${infodir}/info.info ${infodir}/dir ${infodir}/info-*.info \ - ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ - ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" - -FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" -RDEPENDS_${PN} = "perl" -FILES_${PN}-doc = "${infodir}/texinfo* \ - ${datadir}/${tex_texinfo} \ - ${mandir}/man1 ${mandir}/man5" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/texinfo/texinfo_5.2.bb b/meta/recipes-extended/texinfo/texinfo_5.2.bb new file mode 100644 index 0000000000..c1ccaa7ef4 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo_5.2.bb @@ -0,0 +1,62 @@ +SUMMARY = "Documentation system for on-line information and printed output" +DESCRIPTION = "Texinfo is a documentation system that can produce both \ +online information and printed output from a single source file. The \ +GNU Project uses the Texinfo file format for most of its documentation." +HOMEPAGE = "http://www.gnu.org/software/texinfo/" +SECTION = "console/utils" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "zlib ncurses texinfo-native" +DEPENDS_class-native = "zlib-native ncurses-native" + +TARGET_PATCH = "file://use_host_makedoc.patch" +TARGET_PATCH_class-native = "" + +SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ + file://texinfo-4.12-zlib.patch \ + file://texinfo-4.13a-powerpc.patch \ + file://disable-native-tools.patch \ + file://link-zip.patch \ + file://dont-depend-on-help2man.patch \ + ${TARGET_PATCH} \ + " + +SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db" +SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74" + +S = "${WORKDIR}/${BP}" +tex_texinfo = "texmf/tex/texinfo" + +inherit gettext autotools + +do_compile_prepend() { + if [ -d tools ];then + oe_runmake -C tools/gnulib/lib + fi +} + +do_install_append() { + mkdir -p ${D}${datadir}/${tex_texinfo} + install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} + sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi +} + +do_install_append_class-native() { + install -m 755 info/makedoc ${D}${bindir} +} + +PACKAGES += "info info-doc" + +FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" +FILES_info-doc = "${infodir}/info.info ${infodir}/dir ${infodir}/info-*.info \ + ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ + ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" + +FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +RDEPENDS_${PN} = "perl" +FILES_${PN}-doc = "${infodir}/texinfo* \ + ${datadir}/${tex_texinfo} \ + ${mandir}/man1 ${mandir}/man5" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg