diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2003-02-16 01:04:58 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2003-02-16 01:04:58 +0000 |
| commit | ca72af8c21d3d86d71bd07c20f83a6ce3b3f95f6 (patch) | |
| tree | 94cb247d94463e21795dc8f7d8c328e64d0b9200 /x11-wm/wm2 | |
| parent | 8e23a54d978cd2add2d9f61f8dd6fc9820c8036f (diff) | |
| download | ports-ca72af8c21d3d86d71bd07c20f83a6ce3b3f95f6.tar.gz ports-ca72af8c21d3d86d71bd07c20f83a6ce3b3f95f6.zip | |
Notes
Diffstat (limited to 'x11-wm/wm2')
| -rw-r--r-- | x11-wm/wm2/files/patch-aa | 6 | ||||
| -rw-r--r-- | x11-wm/wm2/files/patch-ab | 13 | ||||
| -rw-r--r-- | x11-wm/wm2/files/patch-ac | 11 | ||||
| -rw-r--r-- | x11-wm/wm2/files/patch-ad | 11 |
4 files changed, 36 insertions, 5 deletions
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa index cd93cca6a47e..4666f3385e8f 100644 --- a/x11-wm/wm2/files/patch-aa +++ b/x11-wm/wm2/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Fri Mar 21 20:12:30 1997 -+++ Makefile Wed Sep 22 23:55:40 1999 +--- Makefile.orig Fri Mar 21 12:12:30 1997 ++++ Makefile Tue Jan 28 17:53:41 2003 @@ -1,9 +1,12 @@ -LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm @@ -12,7 +12,7 @@ -CCC = gcc -CFLAGS = -O2 +CC ?= gcc -+CCC = $(CC) ++CCC = $(CXX) +CFLAGS += -I$(PREFIX)/include OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o diff --git a/x11-wm/wm2/files/patch-ab b/x11-wm/wm2/files/patch-ab index 93ca0f808355..897370e67002 100644 --- a/x11-wm/wm2/files/patch-ab +++ b/x11-wm/wm2/files/patch-ab @@ -1,5 +1,14 @@ ---- Manager.C.orig Sat Feb 5 18:09:36 2000 -+++ Manager.C Sat Feb 5 18:10:14 2000 +--- Manager.C.orig Fri Mar 21 12:12:30 1997 ++++ Manager.C Tue Jan 28 17:45:03 2003 +@@ -368,7 +368,7 @@ + return m_currentTime; + } + +-void WindowManager::sigHandler() ++void WindowManager::sigHandler(int) + { + m_signalled = True; + } @@ -526,6 +526,7 @@ extern int putenv(char *); /* not POSIX */ } diff --git a/x11-wm/wm2/files/patch-ac b/x11-wm/wm2/files/patch-ac new file mode 100644 index 000000000000..0b827910c4f6 --- /dev/null +++ b/x11-wm/wm2/files/patch-ac @@ -0,0 +1,11 @@ +--- Manager.h.orig Tue Jan 28 17:41:36 2003 ++++ Manager.h Tue Jan 28 17:41:46 2003 +@@ -85,7 +85,7 @@ + + static Boolean m_initialising; + static int errorHandler(Display *, XErrorEvent *); +- static void sigHandler(); ++ static void sigHandler(int); + static int m_signalled; + + void initialiseScreen(); diff --git a/x11-wm/wm2/files/patch-ad b/x11-wm/wm2/files/patch-ad new file mode 100644 index 000000000000..d6632c8b28f7 --- /dev/null +++ b/x11-wm/wm2/files/patch-ad @@ -0,0 +1,11 @@ +--- General.h.orig Tue Jan 28 17:48:55 2003 ++++ General.h Tue Jan 28 17:49:06 2003 +@@ -40,7 +40,7 @@ + struct sigaction sAct; \ + (void)sigemptyset(&sAct.sa_mask); \ + sAct.sa_flags = 0; \ +- sAct.sa_handler = (SIGNAL_CALLBACK_TYPE(y)); \ ++ sAct.sa_handler = y; \ + (void)sigaction((x), &sAct, NULL); \ + } while (0) + |