Date: Tue, 28 Jan 2003 18:30:45 +0100 (CET) From: Stefan Farfeleder <stefan@fafoe.dyndns.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stefan@fafoe.dyndns.org Subject: ports/47598: [patch] fix x11-wm/wm2 Message-ID: <20030128173045.57EF5173@frog.fafoe>
next in thread | raw e-mail | index | archive | help
>Number: 47598 >Category: ports >Synopsis: [patch] fix x11-wm/wm2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jan 28 09:40:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Stefan Farfeleder >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD frog.fafoe 5.0-CURRENT FreeBSD 5.0-CURRENT #13: Fri Jan 24 20:53:50 CET 2003 freebsd@frog.fafoe:/freebsd/current/obj/freebsd/current/src/sys/FROG i386 >Description: - Fix prototype of sigHandler - Remove wrong cast - Use g++ to compile and link the C++ sources >How-To-Repeat: Try to compile the port (failure noticed on bento: http://bento.freebsd.org/errorlogs/i386-5-latest/wm2-4.0.log). >Fix: --- wm2.diff begins here --- Index: files/patch-aa =================================================================== RCS file: /usr/home/ncvs/ports/x11-wm/wm2/files/patch-aa,v retrieving revision 1.3 diff -c -u -r1.3 patch-aa --- files/patch-aa 6 Oct 1999 04:30:44 -0000 1.3 +++ files/patch-aa 28 Jan 2003 16:55:21 -0000 @@ -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 Index: files/patch-ab =================================================================== RCS file: /usr/home/ncvs/ports/x11-wm/wm2/files/patch-ab,v retrieving revision 1.1 diff -c -u -r1.1 patch-ab --- files/patch-ab 5 Feb 2000 09:16:06 -0000 1.1 +++ files/patch-ab 28 Jan 2003 16:55:54 -0000 @@ -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 */ } Index: files/patch-ac =================================================================== RCS file: files/patch-ac diff -N files/patch-ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ac 28 Jan 2003 16:56:08 -0000 @@ -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(); Index: files/patch-ad =================================================================== RCS file: files/patch-ad diff -N files/patch-ad --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ad 28 Jan 2003 16:56:19 -0000 @@ -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) + --- wm2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030128173045.57EF5173>