texinfo: Update to 5.1
- COPYING was slightly reformated (whitespace changes only) - rebased patches - remove upstreamed patches - added pod2texi to texinfo package - get all man pages from man1 and man5 (From OE-Core rev: f192c444c2d88c49738bea4ff4c3af0cc72916de) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
Richard Purdie
parent
c291032022
commit
5472bdc2f0
|
|
@ -1,79 +0,0 @@
|
|||
Upstream-Status: Inappropŕiate
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
diff -Nurd texinfo-4.13/doc/Makefile.am texinfo-4.13/doc/Makefile.am
|
||||
--- texinfo-4.13/doc/Makefile.am 2008-09-18 21:31:56.000000000 +0300
|
||||
+++ texinfo-4.13/doc/Makefile.am 2013-02-08 03:13:40.943466946 +0200
|
||||
@@ -14,9 +14,6 @@
|
||||
info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
|
||||
DISTCLEANFILES = texinfo texinfo-* info*.info*
|
||||
|
||||
-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
|
||||
- info.5 texinfo.5
|
||||
-
|
||||
# Use the programs built in our distribution, taking account of possible
|
||||
# cross-compiling.
|
||||
MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
|
||||
@@ -36,7 +33,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
|
||||
@@ -77,38 +74,10 @@
|
||||
case $$program in info|install-info) program=g$$program;; \
|
||||
esac
|
||||
|
||||
-# Update the manpage for a binary program; set up the variables,
|
||||
-# make sure the binary is up-to-date and then generate the man page.
|
||||
-man_rule_bin = echo "Updating man page $@" && \
|
||||
- $(man_rule_0) && \
|
||||
- echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
|
||||
- (cd "$$dir" && $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
|
||||
- echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" -o '$@' && \
|
||||
- $(HELP2MAN) --name="$$name" "$$dir/$$program" -o '$@'
|
||||
-
|
||||
-$(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
|
||||
- @name="read Info documents" && $(man_rule_bin)
|
||||
-$(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
|
||||
- @name="compile customizations for Info" && $(man_rule_bin)
|
||||
-$(srcdir)/install-info.1: $(top_srcdir)/install-info/install-info.c $(common_mandeps)
|
||||
- @name="update info/dir entries" && $(man_rule_bin)
|
||||
-
|
||||
-# Here we need some postprocessing:
|
||||
-$(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
|
||||
- @name="translate Texinfo documents" && $(man_rule_bin)
|
||||
- mv $@ $@.tmp
|
||||
- sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' $@.tmp >$@
|
||||
- rm $@.tmp
|
||||
-
|
||||
-$(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
|
||||
- @name="sort Texinfo index files" && $(man_rule_bin)
|
||||
-
|
||||
-
|
||||
## ---------- ##
|
||||
## texi2dvi. ##
|
||||
## ---------- ##
|
||||
|
||||
-man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
|
||||
util_srcdir = $(top_srcdir)/util
|
||||
|
||||
# Do not depend on the current user's settings.
|
||||
@@ -119,14 +88,5 @@
|
||||
common_texi2dvi_deps = $(common_mandeps) \
|
||||
$(util_srcdir)/texi2dvi $(util_srcdir)/texi2pdf
|
||||
|
||||
-$(srcdir)/texi2dvi.1: $(common_texi2dvi_deps)
|
||||
- $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@
|
||||
-
|
||||
-$(srcdir)/texi2pdf.1: $(common_texi2dvi_deps)
|
||||
- $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@
|
||||
-
|
||||
-$(srcdir)/pdftexi2dvi.1: $(common_texi2dvi_deps)
|
||||
- $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@
|
||||
-
|
||||
# Do not create info files for distribution.
|
||||
dist-info:
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
Bump gettext macro numbers as required by newer gettext built by OE.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joshua Lock <josh@linux.intel.com>
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
Index: texinfo-4.13/configure.ac
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/configure.ac
|
||||
+++ texinfo-4.13/configure.ac
|
||||
@@ -193,7 +193,7 @@ AM_CONDITIONAL(INSTALL_WARNINGS,
|
||||
|
||||
# i18n support. To update to a new version of gettext, run:
|
||||
# gettextize -f -c
|
||||
-AM_GNU_GETTEXT_VERSION([0.17])
|
||||
+AM_GNU_GETTEXT_VERSION([0.18])
|
||||
AM_GNU_GETTEXT([external])
|
||||
|
||||
# The test suite.
|
||||
Index: texinfo-4.13/po/Makefile.in.in
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/po/Makefile.in.in
|
||||
+++ texinfo-4.13/po/Makefile.in.in
|
||||
@@ -8,8 +8,8 @@
|
||||
# Please note that the actual code of GNU gettext is covered by the GNU
|
||||
# General Public License and is *not* in the public domain.
|
||||
#
|
||||
-# Origin: gettext-0.17
|
||||
-GETTEXT_MACRO_VERSION = 0.17
|
||||
+# Origin: gettext-0.18
|
||||
+GETTEXT_MACRO_VERSION = 0.18
|
||||
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
Index: texinfo-4.13/gnulib/m4/gnulib-comp.m4
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/gnulib/m4/gnulib-comp.m4
|
||||
+++ texinfo-4.13/gnulib/m4/gnulib-comp.m4
|
||||
@@ -56,7 +56,7 @@ AC_DEFUN([gl_INIT],
|
||||
gl_EXITFAIL
|
||||
gl_GETOPT
|
||||
dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
|
||||
- AM_GNU_GETTEXT_VERSION([0.17])
|
||||
+ AM_GNU_GETTEXT_VERSION([0.18])
|
||||
AC_SUBST([LIBINTL])
|
||||
AC_SUBST([LTLIBINTL])
|
||||
gl_FUNC_GETTIMEOFDAY
|
||||
Index: texinfo-4.13/gnulib/m4/po.m4
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/gnulib/m4/po.m4
|
||||
+++ texinfo-4.13/gnulib/m4/po.m4
|
||||
@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
||||
|
||||
dnl Release version of the gettext macros. This is used to ensure that
|
||||
dnl the gettext macros and po/Makefile.in.in are in sync.
|
||||
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
|
||||
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
|
||||
|
||||
dnl Perform the following tests also if --disable-nls has been given,
|
||||
dnl because they are needed for "make dist" to work.
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
install-info uses symbols from zlib so must link against it.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joshua Lock <josh@linux.intel.com>
|
||||
|
||||
Index: texinfo-4.13/install-info/Makefile.am
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/install-info/Makefile.am
|
||||
+++ texinfo-4.13/install-info/Makefile.am
|
||||
@@ -28,4 +28,4 @@ AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
-I$(top_builddir)/gnulib/lib \
|
||||
-DLOCALEDIR=\"$(localedir)\"
|
||||
-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
|
||||
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
|
||||
--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
|
||||
+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
|
||||
@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
|
||||
const char *carried_over_ptr;
|
||||
size_t carried_over_len, carried_over_count;
|
||||
const char *cur_ptr = mbi_cur_ptr (iter);
|
||||
- int cur_len = mb_len (mbi_cur (iter));
|
||||
+ size_t cur_len = mb_len (mbi_cur (iter));
|
||||
int replen;
|
||||
int delim = 0;
|
||||
int rc;
|
||||
@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
|
||||
mbi_advance (iter))
|
||||
{
|
||||
const char *cur_ptr = mbi_cur_ptr (iter);
|
||||
- int cur_len = mb_len (mbi_cur (iter));
|
||||
+ size_t cur_len = mb_len (mbi_cur (iter));
|
||||
|
||||
if (cur_len == 1)
|
||||
{
|
||||
@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
|
||||
mbi_advance (iter))
|
||||
{
|
||||
const char *cur_ptr = mbi_cur_ptr (iter);
|
||||
- int cur_len = mb_len (mbi_cur (iter));
|
||||
- int replen;
|
||||
+ size_t cur_len = mb_len (mbi_cur (iter));
|
||||
+ size_t replen;
|
||||
|
||||
if (cur_ptr >= endp)
|
||||
break;
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
diff -up texinfo-4.13/info/indices.c.orig texinfo-4.13/info/indices.c
|
||||
--- texinfo-4.13/info/indices.c.orig 2010-08-31 12:04:38.317462471 +0200
|
||||
+++ texinfo-4.13/info/indices.c 2010-08-31 12:11:49.322624552 +0200
|
||||
@@ -192,6 +192,7 @@ do_info_index_search (WINDOW *window, in
|
||||
index for, build and remember an index now. */
|
||||
fb = file_buffer_of_window (window);
|
||||
if (!initial_index_filename ||
|
||||
+ !fb ||
|
||||
(FILENAME_CMP (initial_index_filename, fb->filename) != 0))
|
||||
{
|
||||
info_free_references (index_index);
|
||||
@@ -287,8 +288,9 @@ index_entry_exists (WINDOW *window, char
|
||||
return 0;
|
||||
|
||||
fb = file_buffer_of_window (window);
|
||||
- if (!initial_index_filename
|
||||
- || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
|
||||
+ if (!initial_index_filename ||
|
||||
+ !fb ||
|
||||
+ (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
|
||||
{
|
||||
info_free_references (index_index);
|
||||
index_index = info_indices_of_file_buffer (fb);
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
--- texinfo-4.13/install-info/install-info.c.mosdo-crash 2009-09-02 20:18:44.000000000 -0400
|
||||
+++ texinfo-4.13/install-info/install-info.c 2009-09-02 20:19:53.000000000 -0400
|
||||
@@ -1765,7 +1765,7 @@
|
||||
err = argz_add (&argz, &argz_len, opt);
|
||||
free (opt); opt = NULL;
|
||||
|
||||
- opt = xmalloc (strlen (regex) + sizeof ("--section="));
|
||||
+ opt = xmalloc (strlen (title) + sizeof ("--section="));
|
||||
if (sprintf (opt, "--section=%s", title) == -1)
|
||||
err = 1;
|
||||
if (!err)
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
Upstream-Status: pending
|
||||
|
||||
automake 1.12 has deprecated support for lzma-compressed distribution archives
|
||||
this patch fixes following issue with automake 1.12
|
||||
|
||||
| configure.ac:16: error: support for lzma-compressed distribution archives has been removed
|
||||
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2012/05/03
|
||||
|
||||
|
||||
Index: texinfo-4.13/configure.ac
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/configure.ac
|
||||
+++ texinfo-4.13/configure.ac
|
||||
@@ -13,7 +13,7 @@ AC_INIT([GNU Texinfo], [4.13], [bug-texi
|
||||
|
||||
dnl Must come before AM_INIT_AUTOMAKE.
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
-AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma])
|
||||
+AM_INIT_AUTOMAKE([1.10.1 readme-alpha])
|
||||
|
||||
# Minimum Autoconf version required.
|
||||
AC_PREREQ(2.59)
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
This patch requires that we also enable building of the
|
||||
texinfo-native recipe which will install the makedoc tool
|
||||
for the host machine.
|
||||
|
||||
This patch simply uses the newly installed makedoc tool from
|
||||
sysroot.
|
||||
|
||||
Upstream-Status: Inappropriate [OE-Specific]
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
Index: texinfo-4.13/info/Makefile.am
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/info/Makefile.am 2008-05-22 05:11:33.000000000 -0700
|
||||
+++ texinfo-4.13/info/Makefile.am 2011-12-10 12:55:53.604440118 -0800
|
||||
@@ -75,7 +75,7 @@
|
||||
# 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.
|
||||
Index: texinfo-4.13/doc/Makefile.am
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/doc/Makefile.am 2008-09-18 11:31:56.000000000 -0700
|
||||
+++ texinfo-4.13/doc/Makefile.am 2011-12-10 13:04:09.216457601 -0800
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
# Use the programs built in our distribution, taking account of possible
|
||||
# cross-compiling.
|
||||
-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
|
||||
+MAKEINFO = makeinfo
|
||||
|
||||
# We'd also like to use something like this, but Automake calls
|
||||
# "install-info" directly.
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
Upstream-Status: Inappropŕiate
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
Index: texinfo-5.1/doc/Makefile.am
|
||||
===================================================================
|
||||
--- texinfo-5.1.orig/doc/Makefile.am
|
||||
+++ texinfo-5.1/doc/Makefile.am
|
||||
@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard
|
||||
# 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
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
install-info uses symbols from zlib so must link against it.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joshua Lock <josh@linux.intel.com>
|
||||
|
||||
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
|
||||
|
|
@ -1,21 +1,23 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
diff -up texinfo-4.12/install-info/Makefile.in_old texinfo-4.12/install-info/Makefile.in
|
||||
--- texinfo-4.12/install-info/Makefile.in_old 2008-05-13 13:33:55.000000000 +0200
|
||||
+++ texinfo-4.12/install-info/Makefile.in 2008-05-13 13:52:35.000000000 +0200
|
||||
@@ -114,7 +114,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
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 = ../lib/libtxi.a \
|
||||
$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
|
||||
diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c
|
||||
--- texinfo-4.12/install-info/install-info.c_old 2008-05-13 13:52:44.000000000 +0200
|
||||
+++ texinfo-4.12/install-info/install-info.c 2008-05-14 10:30:53.000000000 +0200
|
||||
@@ -21,6 +21,7 @@
|
||||
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 <getopt.h>
|
||||
#include <regex.h>
|
||||
#include <argz.h>
|
||||
|
|
@ -23,16 +25,16 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
|
||||
#define TAB_WIDTH 8
|
||||
|
||||
@@ -638,7 +639,7 @@ The first time you invoke Info you start
|
||||
COMPRESSION_PROGRAM. The compression program is determined by the
|
||||
magic number, not the filename. */
|
||||
@@ -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)
|
||||
@@ -646,7 +647,7 @@ open_possibly_compressed_file (char *fil
|
||||
@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil
|
||||
char *local_opened_filename, *local_compression_program;
|
||||
int nread;
|
||||
char data[13];
|
||||
|
|
@ -41,7 +43,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
|
||||
/* We let them pass NULL if they don't want this info, but it's easier
|
||||
to always determine it. */
|
||||
@@ -654,22 +655,22 @@ open_possibly_compressed_file (char *fil
|
||||
@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil
|
||||
opened_filename = &local_opened_filename;
|
||||
|
||||
*opened_filename = filename;
|
||||
|
|
@ -52,11 +54,26 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
*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)
|
||||
|
|
@ -66,34 +83,33 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
- f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+ f = gzopen (*opened_filename, FOPEN_RBIN);
|
||||
}
|
||||
|
||||
#ifdef __MSDOS__
|
||||
@@ -677,13 +678,13 @@ open_possibly_compressed_file (char *fil
|
||||
{
|
||||
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
|
||||
if (!f)
|
||||
@@ -695,7 +696,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);
|
||||
}
|
||||
@@ -706,12 +707,12 @@ open_possibly_compressed_file (char *fil
|
||||
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. */
|
||||
|
|
@ -106,10 +122,10 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
"install-info: No error for foo", which is confusing. */
|
||||
- if (nread == 0)
|
||||
+ if (nread >= 0)
|
||||
fatal (_("%s: empty file"), *opened_filename, 0);
|
||||
fatal (_("%s: empty file"), *opened_filename);
|
||||
pfatal_with_name (*opened_filename);
|
||||
}
|
||||
@@ -758,20 +759,22 @@ open_possibly_compressed_file (char *fil
|
||||
@@ -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. */
|
||||
|
|
@ -137,7 +153,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
/* Since this is a text file, and we opened it in binary mode,
|
||||
switch back to text mode. */
|
||||
f = freopen (*opened_filename, "r", f);
|
||||
@@ -796,7 +799,7 @@ readfile (char *filename, int *sizep,
|
||||
@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep,
|
||||
char **compression_program)
|
||||
{
|
||||
char *real_name;
|
||||
|
|
@ -146,7 +162,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
int pipe_p;
|
||||
int filled = 0;
|
||||
int data_size = 8192;
|
||||
@@ -810,7 +813,12 @@ readfile (char *filename, int *sizep,
|
||||
@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep,
|
||||
|
||||
for (;;)
|
||||
{
|
||||
|
|
@ -160,7 +176,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
|
|||
if (nread < 0)
|
||||
pfatal_with_name (real_name);
|
||||
if (nread == 0)
|
||||
@@ -832,7 +840,7 @@ readfile (char *filename, int *sizep,
|
||||
@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep,
|
||||
if (pipe_p)
|
||||
pclose (f);
|
||||
else
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
Upstream-Status: Inappropriate [cross build specific]
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
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.
|
||||
|
|
@ -5,8 +5,7 @@ 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=adefda309052235aa5d1e99ce7557010"
|
||||
PR = "r6"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
DEPENDS = "zlib ncurses texinfo-native"
|
||||
DEPENDS_class-native = "zlib-native ncurses-native"
|
||||
|
|
@ -14,23 +13,19 @@ DEPENDS_class-native = "zlib-native ncurses-native"
|
|||
TARGET_PATCH = "file://use_host_makedoc.patch"
|
||||
TARGET_PATCH_class-native = ""
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
|
||||
SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
|
||||
file://texinfo-4.12-zlib.patch \
|
||||
file://texinfo-4.13a-data_types.patch \
|
||||
file://texinfo-4.13a-mosdo-crash.patch \
|
||||
file://texinfo-4.13a-powerpc.patch \
|
||||
file://texinfo-4.13a-help-index-segfault.patch \
|
||||
file://disable-native-tools.patch \
|
||||
file://link-zip.patch \
|
||||
file://gettext-macros.patch \
|
||||
file://texinfo_fix_for_automake-1.12.patch \
|
||||
file://dont-depend-on-help2man.patch \
|
||||
${TARGET_PATCH}"
|
||||
${TARGET_PATCH} \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"
|
||||
SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
|
||||
SRC_URI[md5sum] = "54e250014fe698fb4832016158747c03"
|
||||
SRC_URI[sha256sum] = "50e8067f9758bb2bf175b69600082ac4a27c464cb4bcd48a578edd3127216600"
|
||||
|
||||
S = "${WORKDIR}/texinfo-4.13"
|
||||
S = "${WORKDIR}/${BP}"
|
||||
tex_texinfo = "texmf/tex/texinfo"
|
||||
|
||||
inherit gettext autotools
|
||||
|
|
@ -56,11 +51,9 @@ 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"
|
||||
FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi"
|
||||
FILES_${PN}-doc = "${datadir}/texinfo ${infodir}/texinfo* \
|
||||
${datadir}/${tex_texinfo} \
|
||||
${mandir}/man1/makeinfo.1* ${mandir}/man5/texinfo.5* \
|
||||
${mandir}/man1/texindex.1* ${mandir}/man1/texi2dvi.1* \
|
||||
${mandir}/man1/texi2pdf.1* ${mandir}/man1/pdftexi2dvi.1*"
|
||||
${mandir}/man1 ${mandir}/man5"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Loading…
Reference in New Issue