summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-09-08 11:17:02 +0000
committerjmmv <jmmv@pkgsrc.org>2004-09-08 11:17:02 +0000
commit55b954c165d1b116c5a62caac67370c4f15b8c90 (patch)
tree356f2c5d22a7034b57051a3f9adfbd7c2487f327 /wm
parent7e0463f51c877d4fc91ff97ea4d9d2e06e8a0c26 (diff)
downloadpkgsrc-55b954c165d1b116c5a62caac67370c4f15b8c90.tar.gz
Fix build: the code was using an incorrect prototype when setting up the
sigaction structure.
Diffstat (limited to 'wm')
-rw-r--r--wm/wm2/distinfo6
-rw-r--r--wm/wm2/patches/patch-ac24
-rw-r--r--wm/wm2/patches/patch-ad13
-rw-r--r--wm/wm2/patches/patch-ae13
4 files changed, 52 insertions, 4 deletions
diff --git a/wm/wm2/distinfo b/wm/wm2/distinfo
index 9df81737d28..ed504eef5d0 100644
--- a/wm/wm2/distinfo
+++ b/wm/wm2/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 21:51:38 jlam Exp $
+$NetBSD: distinfo,v 1.6 2004/09/08 11:17:02 jmmv Exp $
SHA1 (wm2-4.tar.gz) = dd959e72eedca113b372ddf67b95260e25226a91
Size (wm2-4.tar.gz) = 32807 bytes
SHA1 (patch-aa) = 3abf330bd012205dbb6eeff06b0be28fe27835d3
SHA1 (patch-ab) = 047f72483a5f7d250742a5d53aa8a48ca123558e
-SHA1 (patch-ac) = a944150c5e3b6fb82e7cb630e8289a91dcbf4639
+SHA1 (patch-ac) = 65344840133c3880349a6db91e425a8c0c3fb744
+SHA1 (patch-ad) = aec474d34b545ff62db019832b9309fff57723cd
+SHA1 (patch-ae) = 06f3577338d1712139482c3ce9c62b6349f59a53
diff --git a/wm/wm2/patches/patch-ac b/wm/wm2/patches/patch-ac
index 44ebef93cb1..b3135118930 100644
--- a/wm/wm2/patches/patch-ac
+++ b/wm/wm2/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2002/08/25 21:51:38 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2004/09/08 11:17:02 jmmv Exp $
---- General.h.orig Fri Mar 21 12:12:30 1997
+--- General.h.orig 1997-03-21 12:12:30.000000000 +0100
+++ General.h
@@ -10,7 +10,9 @@
#undef _POSIX_SOURCE
@@ -12,3 +12,23 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 21:51:38 jlam Exp $
#include <stdio.h>
#include <signal.h>
+@@ -32,9 +34,10 @@ typedef char Boolean;
+ #define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x)))
+
+ #ifndef SIGNAL_CALLBACK_TYPE
+-#define SIGNAL_CALLBACK_TYPE (void (*)(...))
++#define SIGNAL_CALLBACK_TYPE (void (*)(int sig))
+ #endif
+
++#if defined(SA_SIGINFO)
+ #define signal(x,y) \
+ do { \
+ struct sigaction sAct; \
+@@ -43,6 +46,7 @@ typedef char Boolean;
+ sAct.sa_handler = (SIGNAL_CALLBACK_TYPE(y)); \
+ (void)sigaction((x), &sAct, NULL); \
+ } while (0)
++#endif
+
+ #include "Config.h"
+
diff --git a/wm/wm2/patches/patch-ad b/wm/wm2/patches/patch-ad
new file mode 100644
index 00000000000..d447c81e5cb
--- /dev/null
+++ b/wm/wm2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/09/08 11:17:02 jmmv Exp $
+
+--- Manager.h.orig 1997-03-21 12:12:30.000000000 +0100
++++ Manager.h
+@@ -85,7 +85,7 @@ private:
+
+ static Boolean m_initialising;
+ static int errorHandler(Display *, XErrorEvent *);
+- static void sigHandler();
++ static void sigHandler(int sig);
+ static int m_signalled;
+
+ void initialiseScreen();
diff --git a/wm/wm2/patches/patch-ae b/wm/wm2/patches/patch-ae
new file mode 100644
index 00000000000..9a594a5fdce
--- /dev/null
+++ b/wm/wm2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/09/08 11:17:02 jmmv Exp $
+
+--- Manager.C.orig 1997-03-21 12:12:30.000000000 +0100
++++ Manager.C
+@@ -368,7 +368,7 @@ Time WindowManager::timestamp(Boolean re
+ return m_currentTime;
+ }
+
+-void WindowManager::sigHandler()
++void WindowManager::sigHandler(int sig)
+ {
+ m_signalled = True;
+ }