Mercurial > mxe-octave
changeset 4283:e50cac70e5a7
texinfo: update to 6.3
* src/texinfo.mk: update version, checksum
* src/mingw-texinfo-1-fixes.patch: update patch
| author | John D |
|---|---|
| date | Sun, 18 Dec 2016 13:17:37 -0500 |
| parents | e35307c8102e |
| children | 8addd53be58b |
| files | src/mingw-texinfo-1-fixes.patch src/texinfo.mk |
| diffstat | 2 files changed, 40 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mingw-texinfo-1-fixes.patch Sun Dec 18 13:17:36 2016 -0500 +++ b/src/mingw-texinfo-1-fixes.patch Sun Dec 18 13:17:37 2016 -0500 @@ -1,24 +1,7 @@ -diff -ur texinfo-6.0.orig/info/pcterm.c texinfo-6.0/info/pcterm.c ---- texinfo-6.0.orig/info/pcterm.c 2015-12-10 09:00:52.963609902 -0500 -+++ texinfo-6.0/info/pcterm.c 2015-12-10 09:03:18.982503065 -0500 -@@ -1486,7 +1486,7 @@ - } - - /* These should never be called, but they make the linker happy. */ -- -+#ifndef __MINGW32__ - int tputs (const char *a, int b, int (*c)(int)) - { - perror ("tputs"); return 0; /* here and below, added dummy retvals */ -@@ -1526,3 +1526,4 @@ - { - perror ("tcsetattr"); return 0; - } -+#endif -diff -ur texinfo-6.0.orig/info/echo-area.c texinfo-6.0/info/echo-area.c ---- texinfo-6.0.orig/info/echo-area.c 2015-12-10 09:20:00.142339683 -0500 -+++ texinfo-6.0/info/echo-area.c 2015-12-11 08:22:54.434892634 -0500 -@@ -1529,7 +1529,7 @@ +diff -ur texinfo-6.3.orig/info/echo-area.c texinfo-6.3/info/echo-area.c +--- texinfo-6.3.orig/info/echo-area.c 2016-12-17 14:57:59.207522263 -0500 ++++ texinfo-6.3/info/echo-area.c 2016-12-17 14:58:29.837452042 -0500 +@@ -1528,7 +1528,7 @@ static void pause_or_input (void) { @@ -27,10 +10,10 @@ struct timeval timer; fd_set readfds; -diff -ur texinfo-6.0.orig/info/man.c texinfo-6.0/info/man.c ---- texinfo-6.0.orig/info/man.c 2015-12-10 09:20:00.149339822 -0500 -+++ texinfo-6.0/info/man.c 2015-12-11 08:22:07.250981195 -0500 -@@ -437,7 +437,7 @@ +diff -ur texinfo-6.3.orig/info/man.c texinfo-6.3/info/man.c +--- texinfo-6.3.orig/info/man.c 2016-12-17 14:57:59.212939079 -0500 ++++ texinfo-6.3/info/man.c 2016-12-17 14:58:29.837452042 -0500 +@@ -414,7 +414,7 @@ int bsize = 0; int bindex = 0; int select_result; @@ -39,10 +22,27 @@ fd_set read_fds; timeout.tv_sec = 15; -diff -ur texinfo-6.0.orig/info/session.c texinfo-6.0/info/session.c ---- texinfo-6.0.orig/info/session.c 2015-12-10 09:20:00.148339802 -0500 -+++ texinfo-6.0/info/session.c 2015-12-11 08:21:09.519866019 -0500 -@@ -450,7 +450,7 @@ +diff -ur texinfo-6.3.orig/info/pcterm.c texinfo-6.3/info/pcterm.c +--- texinfo-6.3.orig/info/pcterm.c 2016-12-17 14:57:59.206438899 -0500 ++++ texinfo-6.3/info/pcterm.c 2016-12-17 14:58:29.836368678 -0500 +@@ -1621,7 +1621,7 @@ + } + + /* These should never be called, but they make the linker happy. */ +- ++#ifndef __MINGW32__ + int tputs (const char *a, int b, int (*c)(int)) + { + perror ("tputs"); return 0; /* here and below, added dummy retvals */ +@@ -1661,3 +1661,4 @@ + { + perror ("tcsetattr"); return 0; + } ++#endif +diff -ur texinfo-6.3.orig/info/session.c texinfo-6.3/info/session.c +--- texinfo-6.3.orig/info/session.c 2016-12-17 14:57:59.212939079 -0500 ++++ texinfo-6.3/info/session.c 2016-12-17 14:58:29.838535405 -0500 +@@ -456,7 +456,7 @@ space_avail = sizeof (info_input_buffer) - (push_index - pop_index); /* If we can just find out how many characters there are to read, do so. */ @@ -51,7 +51,7 @@ { ioctl (tty, FIONREAD, &chars_avail); -@@ -644,7 +644,7 @@ +@@ -648,7 +648,7 @@ if (in_map && pop_index == push_index) { int ready = 0; @@ -60,10 +60,7 @@ struct timeval timer, *timerp = 0; fd_set readfds; -diff -ur texinfo-6.0.orig/info/session.c texinfo-6.0/info/session.c ---- texinfo-6.0.orig/info/session.c 2015-12-11 08:35:45.030871874 -0500 -+++ texinfo-6.0/info/session.c 2015-12-11 08:37:57.463463567 -0500 -@@ -5046,7 +5046,7 @@ +@@ -5490,7 +5490,7 @@ ready = 1; if (!info_any_buffered_input_p ()) { @@ -72,15 +69,15 @@ struct timeval timer; fd_set readfds; -diff -ur texinfo-6.0.orig/tp/texi2any.pl texinfo-6.0/tp/texi2any.pl ---- texinfo-6.0.orig/tp/texi2any.pl 2015-12-12 14:09:04.951513297 -0500 -+++ texinfo-6.0/tp/texi2any.pl 2015-12-12 14:12:59.763522012 -0500 -@@ -50,7 +50,7 @@ - my ($real_command_name, $command_directory, $command_suffix) - = fileparse($0, '.pl'); +diff -ur texinfo-6.3.orig/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl +--- texinfo-6.3.orig/tp/texi2any.pl 2016-12-17 14:57:59.069935127 -0500 ++++ texinfo-6.3/tp/texi2any.pl 2016-12-17 14:59:58.097974426 -0500 +@@ -53,7 +53,7 @@ + my $updir = File::Spec->updir(); + # These are substituted by the Makefile to create "texi2any". - my $datadir = '@datadir@'; + my $datadir = '/usr/share'; my $package = '@PACKAGE@'; - my $updir = File::Spec->updir(); + my $packagedir = '@pkglibdir@';
--- a/src/texinfo.mk Sun Dec 18 13:17:36 2016 -0500 +++ b/src/texinfo.mk Sun Dec 18 13:17:37 2016 -0500 @@ -3,8 +3,8 @@ PKG := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0 -$(PKG)_CHECKSUM := 110d45256c4219c88dc2fdb8c9c1a20749e4e7c5 +$(PKG)_VERSION := 6.3 +$(PKG)_CHECKSUM := 29b16c646c7bc9cd351b2f1d8dafdce70e5377f6 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)