Mercurial > mxe-octave

comparison src/mingw-texinfo-1-fixes.patch @ 4283:e50cac70e5a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1c07ed56b880
children b88723578fec
comparison
equal deleted inserted replaced
4282:e35307c8102e 4283:e50cac70e5a7
1 diff -ur texinfo-6.0.orig/info/pcterm.c texinfo-6.0/info/pcterm.c 1 diff -ur texinfo-6.3.orig/info/echo-area.c texinfo-6.3/info/echo-area.c
2 --- texinfo-6.0.orig/info/pcterm.c 2015-12-10 09:00:52.963609902 -0500 2 --- texinfo-6.3.orig/info/echo-area.c 2016-12-17 14:57:59.207522263 -0500
3 +++ texinfo-6.0/info/pcterm.c 2015-12-10 09:03:18.982503065 -0500 3 +++ texinfo-6.3/info/echo-area.c 2016-12-17 14:58:29.837452042 -0500
4 @@ -1486,7 +1486,7 @@ 4 @@ -1528,7 +1528,7 @@
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;
12
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 @@
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;
23
24 timeout.tv_sec = 15;
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 @@
5 } 29 }
6 30
7 /* These should never be called, but they make the linker happy. */ 31 /* These should never be called, but they make the linker happy. */
8 - 32 -
9 +#ifndef __MINGW32__ 33 +#ifndef __MINGW32__
10 int tputs (const char *a, int b, int (*c)(int)) 34 int tputs (const char *a, int b, int (*c)(int))
11 { 35 {
12 perror ("tputs"); return 0; /* here and below, added dummy retvals */ 36 perror ("tputs"); return 0; /* here and below, added dummy retvals */
13 @@ -1526,3 +1526,4 @@ 37 @@ -1661,3 +1661,4 @@
14 { 38 {
15 perror ("tcsetattr"); return 0; 39 perror ("tcsetattr"); return 0;
16 } 40 }
17 +#endif 41 +#endif
18 diff -ur texinfo-6.0.orig/info/echo-area.c texinfo-6.0/info/echo-area.c 42 diff -ur texinfo-6.3.orig/info/session.c texinfo-6.3/info/session.c
19 --- texinfo-6.0.orig/info/echo-area.c 2015-12-10 09:20:00.142339683 -0500 43 --- texinfo-6.3.orig/info/session.c 2016-12-17 14:57:59.212939079 -0500
20 +++ texinfo-6.0/info/echo-area.c 2015-12-11 08:22:54.434892634 -0500 44 +++ texinfo-6.3/info/session.c 2016-12-17 14:58:29.838535405 -0500
21 @@ -1529,7 +1529,7 @@ 45 @@ -456,7 +456,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;
29
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;
40
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); 46 space_avail = sizeof (info_input_buffer) - (push_index - pop_index);
47 47
48 /* If we can just find out how many characters there are to read, do so. */ 48 /* If we can just find out how many characters there are to read, do so. */
49 -#if defined (FIONREAD) 49 -#if defined (FIONREAD)
50 +#if defined (FIONREAD) && !defined(__MINGW32__) 50 +#if defined (FIONREAD) && !defined(__MINGW32__)
51 { 51 {
52 ioctl (tty, FIONREAD, &chars_avail); 52 ioctl (tty, FIONREAD, &chars_avail);
53 53
54 @@ -644,7 +644,7 @@ 54 @@ -648,7 +648,7 @@
55 if (in_map && pop_index == push_index) 55 if (in_map && pop_index == push_index)
56 { 56 {
57 int ready = 0; 57 int ready = 0;
58 -#if defined (FD_SET) 58 -#if defined (FD_SET)
59 +#if defined (FD_SET) && !defined(__MINGW32__) 59 +#if defined (FD_SET) && !defined(__MINGW32__)
60 struct timeval timer, *timerp = 0; 60 struct timeval timer, *timerp = 0;
61 fd_set readfds; 61 fd_set readfds;
62 62
63 diff -ur texinfo-6.0.orig/info/session.c texinfo-6.0/info/session.c 63 @@ -5490,7 +5490,7 @@
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; 64 ready = 1;
68 if (!info_any_buffered_input_p ()) 65 if (!info_any_buffered_input_p ())
69 { 66 {
70 -#if defined (FD_SET) 67 -#if defined (FD_SET)
71 +#if defined (FD_SET) && !defined(__MINGW32__) 68 +#if defined (FD_SET) && !defined(__MINGW32__)
72 struct timeval timer; 69 struct timeval timer;
73 fd_set readfds; 70 fd_set readfds;
74 71
75 diff -ur texinfo-6.0.orig/tp/texi2any.pl texinfo-6.0/tp/texi2any.pl 72 diff -ur texinfo-6.3.orig/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl
76 --- texinfo-6.0.orig/tp/texi2any.pl 2015-12-12 14:09:04.951513297 -0500 73 --- texinfo-6.3.orig/tp/texi2any.pl 2016-12-17 14:57:59.069935127 -0500
77 +++ texinfo-6.0/tp/texi2any.pl 2015-12-12 14:12:59.763522012 -0500 74 +++ texinfo-6.3/tp/texi2any.pl 2016-12-17 14:59:58.097974426 -0500
78 @@ -50,7 +50,7 @@ 75 @@ -53,7 +53,7 @@
79 my ($real_command_name, $command_directory, $command_suffix) 76 my $updir = File::Spec->updir();
80 = fileparse($0, '.pl');
81 77
78 # These are substituted by the Makefile to create "texi2any".
82 - my $datadir = '@datadir@'; 79 - my $datadir = '@datadir@';
83 + my $datadir = '/usr/share'; 80 + my $datadir = '/usr/share';
84 my $package = '@PACKAGE@'; 81 my $package = '@PACKAGE@';
85 my $updir = File::Spec->updir(); 82 my $packagedir = '@pkglibdir@';
86 83