Mercurial > mxe-octave
annotate src/mingw-texinfo-1-fixes.patch @ 4673:010dc6a420ff
stable-octave: bump version number
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 19 Apr 2018 21:57:06 -0400 |
| parents | e50cac70e5a7 |
| children | b88723578fec |
| rev | line source |
|---|---|
| 4283 | 1 diff -ur texinfo-6.3.orig/info/echo-area.c texinfo-6.3/info/echo-area.c |
| 2 --- texinfo-6.3.orig/info/echo-area.c 2016-12-17 14:57:59.207522263 -0500 | |
| 3 +++ texinfo-6.3/info/echo-area.c 2016-12-17 14:58:29.837452042 -0500 | |
| 4 @@ -1528,7 +1528,7 @@ | |
| 4123 | 5 static void |
| 6 pause_or_input (void) | |
| 7 { | |
| 8 -#ifdef FD_SET | |
| 9 +#if defined(FD_SET) && !defined(__MINGW32__) | |
| 10 struct timeval timer; | |
| 11 fd_set readfds; | |
| 3587 | 12 |
| 4283 | 13 diff -ur texinfo-6.3.orig/info/man.c texinfo-6.3/info/man.c |
| 14 --- texinfo-6.3.orig/info/man.c 2016-12-17 14:57:59.212939079 -0500 | |
| 15 +++ texinfo-6.3/info/man.c 2016-12-17 14:58:29.837452042 -0500 | |
| 16 @@ -414,7 +414,7 @@ | |
| 4123 | 17 int bsize = 0; |
| 18 int bindex = 0; | |
| 19 int select_result; | |
| 20 -#if defined (FD_SET) | |
| 21 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 22 fd_set read_fds; | |
| 3587 | 23 |
| 4123 | 24 timeout.tv_sec = 15; |
| 4283 | 25 diff -ur texinfo-6.3.orig/info/pcterm.c texinfo-6.3/info/pcterm.c |
| 26 --- texinfo-6.3.orig/info/pcterm.c 2016-12-17 14:57:59.206438899 -0500 | |
| 27 +++ texinfo-6.3/info/pcterm.c 2016-12-17 14:58:29.836368678 -0500 | |
| 28 @@ -1621,7 +1621,7 @@ | |
| 29 } | |
| 30 | |
| 31 /* These should never be called, but they make the linker happy. */ | |
| 32 - | |
| 33 +#ifndef __MINGW32__ | |
| 34 int tputs (const char *a, int b, int (*c)(int)) | |
| 35 { | |
| 36 perror ("tputs"); return 0; /* here and below, added dummy retvals */ | |
| 37 @@ -1661,3 +1661,4 @@ | |
| 38 { | |
| 39 perror ("tcsetattr"); return 0; | |
| 40 } | |
| 41 +#endif | |
| 42 diff -ur texinfo-6.3.orig/info/session.c texinfo-6.3/info/session.c | |
| 43 --- texinfo-6.3.orig/info/session.c 2016-12-17 14:57:59.212939079 -0500 | |
| 44 +++ texinfo-6.3/info/session.c 2016-12-17 14:58:29.838535405 -0500 | |
| 45 @@ -456,7 +456,7 @@ | |
| 4123 | 46 space_avail = sizeof (info_input_buffer) - (push_index - pop_index); |
| 3587 | 47 |
| 4123 | 48 /* If we can just find out how many characters there are to read, do so. */ |
| 49 -#if defined (FIONREAD) | |
| 50 +#if defined (FIONREAD) && !defined(__MINGW32__) | |
| 51 { | |
| 52 ioctl (tty, FIONREAD, &chars_avail); | |
| 53 | |
| 4283 | 54 @@ -648,7 +648,7 @@ |
| 4123 | 55 if (in_map && pop_index == push_index) |
| 56 { | |
| 57 int ready = 0; | |
| 58 -#if defined (FD_SET) | |
| 59 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 60 struct timeval timer, *timerp = 0; | |
| 61 fd_set readfds; | |
| 3587 | 62 |
| 4283 | 63 @@ -5490,7 +5490,7 @@ |
| 4123 | 64 ready = 1; |
| 65 if (!info_any_buffered_input_p ()) | |
| 66 { | |
| 67 -#if defined (FD_SET) | |
| 68 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 69 struct timeval timer; | |
| 70 fd_set readfds; | |
| 3587 | 71 |
| 4283 | 72 diff -ur texinfo-6.3.orig/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl |
| 73 --- texinfo-6.3.orig/tp/texi2any.pl 2016-12-17 14:57:59.069935127 -0500 | |
| 74 +++ texinfo-6.3/tp/texi2any.pl 2016-12-17 14:59:58.097974426 -0500 | |
| 75 @@ -53,7 +53,7 @@ | |
| 76 my $updir = File::Spec->updir(); | |
| 3587 | 77 |
| 4283 | 78 # These are substituted by the Makefile to create "texi2any". |
| 4123 | 79 - my $datadir = '@datadir@'; |
|
4125
1c07ed56b880
Fix texinfo patch missing semicoon (Bug #46637)
"lostbard" <john.donoghue@ieee.org>
parents:
4123
diff
changeset
|
80 + my $datadir = '/usr/share'; |
| 4123 | 81 my $package = '@PACKAGE@'; |
| 4283 | 82 my $packagedir = '@pkglibdir@'; |
| 3587 | 83 |