Mercurial > mxe-octave
annotate src/transfig-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 | b96d29842043 |
children | 1490118493f0 |
rev | line source |
---|---|
5888
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
1 diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
2 --- fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c 2021-09-06 12:57:54.175751149 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
3 +++ fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c 2021-09-06 13:10:27.022794005 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
4 @@ -95,6 +95,13 @@ |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
5 static int border_margin = 0; |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
6 static int smooth = 0; |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
7 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
8 +#if defined (__WIN32__) || !defined (__CYGWIN__) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
9 + #define WEXITSTATUS(w) (w) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
10 + #define WIFEXITED(w) (true) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
11 + #define WIFSIGNALED(w) (false) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
12 + #define WTERMSIG(w) (0) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
13 +#endif |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
14 + |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
15 void |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
16 genbitmaps_option(char opt, char *optarg) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
17 { |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
18 @@ -498,7 +505,9 @@ |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
19 BITMAP_EXIT_FAILURE; |
4863 | 20 } |
5888
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
21 |
4863 | 22 +#if !defined (__WIN32__) || defined (__CYGWIN__) |
23 (void) signal(SIGPIPE, bitmaps_broken_pipe); | |
24 +#endif | |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
25 if ((tfp = popen(com, "w")) == NULL) { |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
26 fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); |
4863 | 27 fprintf(stderr, "command was: %s\n", com); |
5888
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
28 @@ -542,8 +551,9 @@ |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
29 else |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
30 status = -1; |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
31 tfp = NULL; /* Otherwise main() tries to close tfp again */ |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
32 +#if !defined (__WIN32__) || defined (__CYGWIN__) |
4178 | 33 (void) signal(SIGPIPE, SIG_DFL); |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
34 - |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
35 +#endif |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
36 if (status != 0) { |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
37 FILE *f; |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
38 |
5888
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
39 diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8b/fig2dev/dev/genpdf.c |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
40 --- fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c 2021-09-06 12:57:54.174751090 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
41 +++ fig2dev-3.2.8b/fig2dev/dev/genpdf.c 2021-09-06 13:00:15.862053203 -0400 |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
42 @@ -111,7 +111,9 @@ |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
43 exit(EXIT_FAILURE); |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
44 } |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
45 |
4178 | 46 +#if !defined (__WIN32__) || defined (__CYGWIN__) |
4863 | 47 (void) signal(SIGPIPE, pdf_broken_pipe); |
4178 | 48 +#endif |
4863 | 49 if ((tfp = popen(com, "w")) == 0) { |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
50 err_msg("fig2dev: Cannot open pipe to ghostscript"); |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
51 put_msg("Command was: %s", com); |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
52 @@ -145,7 +147,9 @@ |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
53 err_msg("Error in ghostcript command,\n %s", com); |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
54 status = -1; |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
55 } else { |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
56 +#if !defined (__WIN32__) || defined (__CYGWIN__) |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
57 (void)signal(SIGPIPE, SIG_DFL); |
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
58 +#endif |
4178 | 59 } |
60 | |
5618
bd132bde9ae2
transfig: updae to v3.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
4863
diff
changeset
|
61 if (com != com_buf) |
5888
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
62 diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c fig2dev-3.2.8b/fig2dev/dev/readeps.c |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
63 --- fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c 2021-09-06 12:57:54.173751032 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
64 +++ fig2dev-3.2.8b/fig2dev/dev/readeps.c 2021-09-06 13:13:39.700059768 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
65 @@ -35,6 +35,13 @@ |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
66 #include "messages.h" |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
67 #include "readpics.h" |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
68 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
69 +#if defined (__WIN32__) || !defined (__CYGWIN__) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
70 + #define WEXITSTATUS(w) (w) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
71 + #define WIFEXITED(w) (true) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
72 + #define WIFSIGNALED(w) (false) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
73 + #define WTERMSIG(w) (0) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
74 +#endif |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
75 + |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
76 int read_eps(F_pic *pic, struct xfig_stream *restrict pic_stream, |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
77 int *llx, int *lly); |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
78 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
79 diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c fig2dev-3.2.8b/fig2dev/dev/readpics.c |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
80 --- fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c 2021-09-06 12:57:54.173751032 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
81 +++ fig2dev-3.2.8b/fig2dev/dev/readpics.c 2021-09-06 13:11:49.848636802 -0400 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
82 @@ -36,6 +36,15 @@ |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
83 #include "xtmpfile.h" |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
84 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
85 |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
86 +#if defined (__WIN32__) || !defined (__CYGWIN__) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
87 + #define WEXITSTATUS(w) (w) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
88 + #define WIFEXITED(w) (true) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
89 + #define WIFSIGNALED(w) (false) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
90 + #define WTERMSIG(w) (0) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
91 +#endif |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
92 + |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
93 + |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
94 + |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
95 void |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
96 init_stream(struct xfig_stream *restrict xf_stream) |
b96d29842043
transfig: update to v3.2.8b
John Donoghue <john.donoghue@ieee.org>
parents:
5756
diff
changeset
|
97 { |