Mercurial > mxe-octave
annotate src/mingw-texinfo-1-fixes.patch @ 4125:1c07ed56b880
Fix texinfo patch missing semicoon (Bug #46637)
* src/mingw-texinfo-1-fixes.patch: add missing seimicolon to patch
| author | "lostbard" <john.donoghue@ieee.org> |
|---|---|
| date | Tue, 19 Apr 2016 09:55:48 -0400 |
| parents | 28a83a566666 |
| children | e50cac70e5a7 |
| rev | line source |
|---|---|
| 4123 | 1 diff -ur texinfo-6.0.orig/info/pcterm.c texinfo-6.0/info/pcterm.c |
| 2 --- texinfo-6.0.orig/info/pcterm.c 2015-12-10 09:00:52.963609902 -0500 | |
| 3 +++ texinfo-6.0/info/pcterm.c 2015-12-10 09:03:18.982503065 -0500 | |
| 4 @@ -1486,7 +1486,7 @@ | |
| 3587 | 5 } |
| 6 | |
| 7 /* These should never be called, but they make the linker happy. */ | |
| 8 - | |
| 9 +#ifndef __MINGW32__ | |
| 4123 | 10 int tputs (const char *a, int b, int (*c)(int)) |
| 3587 | 11 { |
| 4123 | 12 perror ("tputs"); return 0; /* here and below, added dummy retvals */ |
| 13 @@ -1526,3 +1526,4 @@ | |
| 3587 | 14 { |
| 15 perror ("tcsetattr"); return 0; | |
| 16 } | |
| 17 +#endif | |
| 4123 | 18 diff -ur texinfo-6.0.orig/info/echo-area.c texinfo-6.0/info/echo-area.c |
| 19 --- texinfo-6.0.orig/info/echo-area.c 2015-12-10 09:20:00.142339683 -0500 | |
| 20 +++ texinfo-6.0/info/echo-area.c 2015-12-11 08:22:54.434892634 -0500 | |
| 21 @@ -1529,7 +1529,7 @@ | |
| 22 static void | |
| 23 pause_or_input (void) | |
| 24 { | |
| 25 -#ifdef FD_SET | |
| 26 +#if defined(FD_SET) && !defined(__MINGW32__) | |
| 27 struct timeval timer; | |
| 28 fd_set readfds; | |
| 3587 | 29 |
| 4123 | 30 diff -ur texinfo-6.0.orig/info/man.c texinfo-6.0/info/man.c |
| 31 --- texinfo-6.0.orig/info/man.c 2015-12-10 09:20:00.149339822 -0500 | |
| 32 +++ texinfo-6.0/info/man.c 2015-12-11 08:22:07.250981195 -0500 | |
| 33 @@ -437,7 +437,7 @@ | |
| 34 int bsize = 0; | |
| 35 int bindex = 0; | |
| 36 int select_result; | |
| 37 -#if defined (FD_SET) | |
| 38 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 39 fd_set read_fds; | |
| 3587 | 40 |
| 4123 | 41 timeout.tv_sec = 15; |
| 42 diff -ur texinfo-6.0.orig/info/session.c texinfo-6.0/info/session.c | |
| 43 --- texinfo-6.0.orig/info/session.c 2015-12-10 09:20:00.148339802 -0500 | |
| 44 +++ texinfo-6.0/info/session.c 2015-12-11 08:21:09.519866019 -0500 | |
| 45 @@ -450,7 +450,7 @@ | |
| 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 | |
| 54 @@ -644,7 +644,7 @@ | |
| 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 |
| 4123 | 63 diff -ur texinfo-6.0.orig/info/session.c texinfo-6.0/info/session.c |
| 64 --- texinfo-6.0.orig/info/session.c 2015-12-11 08:35:45.030871874 -0500 | |
| 65 +++ texinfo-6.0/info/session.c 2015-12-11 08:37:57.463463567 -0500 | |
| 66 @@ -5046,7 +5046,7 @@ | |
| 67 ready = 1; | |
| 68 if (!info_any_buffered_input_p ()) | |
| 69 { | |
| 70 -#if defined (FD_SET) | |
| 71 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 72 struct timeval timer; | |
| 73 fd_set readfds; | |
| 3587 | 74 |
| 4123 | 75 diff -ur texinfo-6.0.orig/tp/texi2any.pl texinfo-6.0/tp/texi2any.pl |
| 76 --- texinfo-6.0.orig/tp/texi2any.pl 2015-12-12 14:09:04.951513297 -0500 | |
| 77 +++ texinfo-6.0/tp/texi2any.pl 2015-12-12 14:12:59.763522012 -0500 | |
| 78 @@ -50,7 +50,7 @@ | |
| 79 my ($real_command_name, $command_directory, $command_suffix) | |
| 80 = fileparse($0, '.pl'); | |
| 3587 | 81 |
| 4123 | 82 - my $datadir = '@datadir@'; |
|
4125
1c07ed56b880
Fix texinfo patch missing semicoon (Bug #46637)
"lostbard" <john.donoghue@ieee.org>
parents:
4123
diff
changeset
|
83 + my $datadir = '/usr/share'; |
| 4123 | 84 my $package = '@PACKAGE@'; |
| 85 my $updir = File::Spec->updir(); | |
| 3587 | 86 |