Mercurial > mxe-octave
annotate src/mingw-texinfo-1-fixes.patch @ 5893:53a6c7df43f8
Mesa 3D: Update to version 21.1.8.
* src/mesa.mk: Update version and checksum.
* src/mesa-2-uninitialized.patch: Remove file.
* dist-files.mk: Remove file from list.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 16 Sep 2021 22:37:45 +0200 |
| parents | b88723578fec |
| children |
| rev | line source |
|---|---|
| 5016 | 1 diff -ur texinfo-6.6.orig/info/man.c texinfo-6.6/info/man.c |
| 2 --- texinfo-6.6.orig/info/man.c 2019-03-08 16:34:38.634930145 -0500 | |
| 3 +++ texinfo-6.6/info/man.c 2019-03-08 16:41:52.845293995 -0500 | |
| 4283 | 4 @@ -414,7 +414,7 @@ |
| 4123 | 5 int bsize = 0; |
| 6 int bindex = 0; | |
| 7 int select_result; | |
| 8 -#if defined (FD_SET) | |
| 9 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 10 fd_set read_fds; | |
| 3587 | 11 |
| 4123 | 12 timeout.tv_sec = 15; |
| 5016 | 13 diff -ur texinfo-6.6.orig/info/pcterm.c texinfo-6.6/info/pcterm.c |
| 14 --- texinfo-6.6.orig/info/pcterm.c 2019-03-08 16:34:38.630930050 -0500 | |
| 15 +++ texinfo-6.6/info/pcterm.c 2019-03-08 16:41:52.845293995 -0500 | |
| 16 @@ -1679,7 +1679,7 @@ | |
| 4283 | 17 } |
| 18 | |
| 19 /* These should never be called, but they make the linker happy. */ | |
| 20 - | |
| 21 +#ifndef __MINGW32__ | |
| 22 int tputs (const char *a, int b, int (*c)(int)) | |
| 23 { | |
| 24 perror ("tputs"); return 0; /* here and below, added dummy retvals */ | |
| 5016 | 25 @@ -1719,3 +1719,4 @@ |
| 4283 | 26 { |
| 27 perror ("tcsetattr"); return 0; | |
| 28 } | |
| 29 +#endif | |
| 5016 | 30 Only in texinfo-6.6/info: pcterm.c.orig |
| 31 diff -ur texinfo-6.6.orig/info/session.c texinfo-6.6/info/session.c | |
| 32 --- texinfo-6.6.orig/info/session.c 2019-03-08 16:34:38.634930145 -0500 | |
| 33 +++ texinfo-6.6/info/session.c 2019-03-08 16:41:52.849294091 -0500 | |
| 34 @@ -453,7 +453,7 @@ | |
| 4123 | 35 space_avail = sizeof (info_input_buffer) - (push_index - pop_index); |
| 3587 | 36 |
| 4123 | 37 /* If we can just find out how many characters there are to read, do so. */ |
| 38 -#if defined (FIONREAD) | |
| 39 +#if defined (FIONREAD) && !defined(__MINGW32__) | |
| 40 { | |
| 41 ioctl (tty, FIONREAD, &chars_avail); | |
| 42 | |
| 5016 | 43 @@ -645,7 +645,7 @@ |
| 4123 | 44 if (in_map && pop_index == push_index) |
| 45 { | |
| 46 int ready = 0; | |
| 47 -#if defined (FD_SET) | |
| 48 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 49 struct timeval timer, *timerp = 0; | |
| 50 fd_set readfds; | |
| 3587 | 51 |
| 5016 | 52 @@ -750,7 +750,7 @@ |
| 53 void | |
| 54 pause_or_input (void) | |
| 55 { | |
| 56 -#ifdef FD_SET | |
| 57 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 58 struct timeval timer; | |
| 59 fd_set readfds; | |
| 60 #endif | |
| 61 @@ -758,7 +758,7 @@ | |
| 62 if (pop_index != push_index) | |
| 63 return; /* Input is already waiting. */ | |
| 64 | |
| 65 -#ifdef FD_SET | |
| 66 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 67 FD_ZERO (&readfds); | |
| 68 FD_SET (fileno (stdin), &readfds); | |
| 69 timer.tv_sec = 2; | |
| 70 @@ -5433,7 +5433,7 @@ | |
| 4123 | 71 ready = 1; |
| 72 if (!info_any_buffered_input_p ()) | |
| 73 { | |
| 74 -#if defined (FD_SET) | |
| 75 +#if defined (FD_SET) && !defined(__MINGW32__) | |
| 76 struct timeval timer; | |
| 77 fd_set readfds; | |
| 3587 | 78 |
| 5016 | 79 Only in texinfo-6.6/info: session.c.orig |
| 80 diff -ur texinfo-6.6.orig/tp/texi2any.pl texinfo-6.6/tp/texi2any.pl | |
| 81 --- texinfo-6.6.orig/tp/texi2any.pl 2019-03-08 16:34:38.490926704 -0500 | |
| 82 +++ texinfo-6.6/tp/texi2any.pl 2019-03-08 16:41:52.849294091 -0500 | |
| 83 @@ -54,7 +54,7 @@ | |
| 4283 | 84 my $updir = File::Spec->updir(); |
| 3587 | 85 |
| 4283 | 86 # These are substituted by the Makefile to create "texi2any". |
| 4123 | 87 - my $datadir = '@datadir@'; |
|
4125
1c07ed56b880
Fix texinfo patch missing semicoon (Bug #46637)
"lostbard" <john.donoghue@ieee.org>
parents:
4123
diff
changeset
|
88 + my $datadir = '/usr/share'; |
| 4123 | 89 my $package = '@PACKAGE@'; |
| 4283 | 90 my $packagedir = '@pkglibdir@'; |
| 3587 | 91 |
| 5016 | 92 Only in texinfo-6.6/tp: texi2any.pl.orig |