Fix the build on 4.X.

Reported by:	pointyhat via kris

1 files changed, 20 insertions, 5 deletions

diff --git a/x11/gnome-swallow/files/patch-gnome-swallow.c b/x11/gnome-swallow/files/patch-gnome-swallow.c
index c363265c9b02..49b5b5c1fba6 100644
--- a/x11/gnome-swallow/files/patch-gnome-swallow.c
+++ b/x11/gnome-swallow/files/patch-gnome-swallow.c
@@ -1,12 +1,12 @@
---- gnome-swallow.c.orig	Wed Apr 16 03:02:18 2003
-+++ gnome-swallow.c	Wed Apr 16 03:05:58 2003
+--- gnome-swallow.c.orig	Fri Sep 12 00:21:55 2003
++++ gnome-swallow.c	Sun Apr 24 00:28:34 2005
 @@ -1,3 +1,5 @@
 +#include <sys/types.h>
 +#include <sys/time.h>
  #include <string.h>
  #include <stdio.h>
- 
-@@ -52,7 +54,7 @@
+ #include <signal.h>
+@@ -55,7 +57,7 @@ gboolean swallow(char* wantedWindow, Dis
  
      XSync (display, FALSE);
  
@@ -15,7 +15,7 @@
      now = start = (double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0);
  
      while (ready == FALSE && now < (start + 10.0))
-@@ -128,7 +130,7 @@
+@@ -131,7 +133,7 @@ gboolean swallow(char* wantedWindow, Dis
          fprintf(stderr,"Loop");
          gtk_main_iteration_do(FALSE);
  
@@ -24,3 +24,18 @@
          now = (double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0);
      }
  
+@@ -249,13 +251,13 @@ void exitProgram(GtkWidget* w, gpointer 
+ void forkApplet(struct AppletConfigure* ap)
+ {
+     if(ap->pid > -1) {
++        int s;
+         /* Kill the old process and wait for it to die (if the process
+            is already dead then it will be a zombie anyway).
+          */
+         kill(ap->pid, SIGTERM);
+         sleep(1);
+         kill(ap->pid, SIGKILL);
+-        int s;
+         waitpid(ap->pid, &s, WNOHANG);
+     }
+