view 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
line wrap: on
line source

diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c
--- fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c	2021-09-06 12:57:54.175751149 -0400
+++ fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c	2021-09-06 13:10:27.022794005 -0400
@@ -95,6 +95,13 @@
 static int	border_margin = 0;
 static int	smooth = 0;
 
+#if defined (__WIN32__) || !defined (__CYGWIN__)
+  #define WEXITSTATUS(w)  (w)
+  #define WIFEXITED(w)	  (true)
+  #define WIFSIGNALED(w)  (false)
+  #define WTERMSIG(w)     (0)
+#endif
+
 void
 genbitmaps_option(char opt, char *optarg)
 {
@@ -498,7 +505,9 @@
 		BITMAP_EXIT_FAILURE;
 	}
 
+#if !defined (__WIN32__) || defined (__CYGWIN__)
 	(void) signal(SIGPIPE, bitmaps_broken_pipe);
+#endif
 	if ((tfp = popen(com, "w")) == NULL) {
 		fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n");
 		fprintf(stderr, "command was: %s\n", com);
@@ -542,8 +551,9 @@
 	else
 		status = -1;
 	tfp = NULL;	/* Otherwise main() tries to close tfp again */
+#if !defined (__WIN32__) || defined (__CYGWIN__)
 	(void) signal(SIGPIPE, SIG_DFL);
-
+#endif
 	if (status != 0) {
 		FILE	*f;
 
diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8b/fig2dev/dev/genpdf.c
--- fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c	2021-09-06 12:57:54.174751090 -0400
+++ fig2dev-3.2.8b/fig2dev/dev/genpdf.c	2021-09-06 13:00:15.862053203 -0400
@@ -111,7 +111,9 @@
 		exit(EXIT_FAILURE);
 	}
 
+#if !defined (__WIN32__) || defined (__CYGWIN__)
 	(void) signal(SIGPIPE, pdf_broken_pipe);
+#endif
 	if ((tfp = popen(com, "w")) == 0) {
 		err_msg("fig2dev: Cannot open pipe to ghostscript");
 		put_msg("Command was: %s", com);
@@ -145,7 +147,9 @@
 		err_msg("Error in ghostcript command,\n  %s", com);
 		status = -1;
 	} else {
+#if !defined (__WIN32__) || defined (__CYGWIN__)
 		(void)signal(SIGPIPE, SIG_DFL);
+#endif
 	}
 
 	if (com != com_buf)
diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c fig2dev-3.2.8b/fig2dev/dev/readeps.c
--- fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c	2021-09-06 12:57:54.173751032 -0400
+++ fig2dev-3.2.8b/fig2dev/dev/readeps.c	2021-09-06 13:13:39.700059768 -0400
@@ -35,6 +35,13 @@
 #include "messages.h"
 #include "readpics.h"
 
+#if defined (__WIN32__) || !defined (__CYGWIN__)
+  #define WEXITSTATUS(w)  (w)
+  #define WIFEXITED(w)	  (true)
+  #define WIFSIGNALED(w)  (false)
+  #define WTERMSIG(w)     (0)
+#endif
+
 int	read_eps(F_pic *pic, struct xfig_stream *restrict pic_stream,
 		int *llx, int *lly);
 
diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c fig2dev-3.2.8b/fig2dev/dev/readpics.c
--- fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c	2021-09-06 12:57:54.173751032 -0400
+++ fig2dev-3.2.8b/fig2dev/dev/readpics.c	2021-09-06 13:11:49.848636802 -0400
@@ -36,6 +36,15 @@
 #include "xtmpfile.h"
 
 
+#if defined (__WIN32__) || !defined (__CYGWIN__)
+  #define WEXITSTATUS(w)  (w)
+  #define WIFEXITED(w)	  (true)
+  #define WIFSIGNALED(w)  (false)
+  #define WTERMSIG(w)     (0)
+#endif
+
+
+
 void
 init_stream(struct xfig_stream *restrict xf_stream)
 {