fix build after putenv() prototype change and regen patches

This commit is contained in:
naddy 2009-06-04 23:37:50 +00:00
parent ba57931ec4
commit cfc5dacf60
5 changed files with 15 additions and 26 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2007/09/15 20:04:26 merdely Exp $
# $OpenBSD: Makefile,v 1.18 2009/06/04 23:37:50 naddy Exp $
COMMENT= minimal window manager
DISTNAME= wmx-6
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
HOMEPAGE= http://www.all-day-breakfast.com/wmx/

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Config.h,v 1.3 2002/09/30 14:31:50 naddy Exp $
$OpenBSD: patch-Config.h,v 1.4 2009/06/04 23:37:50 naddy Exp $
--- Config.h.orig Wed May 24 17:48:59 2000
+++ Config.h Mon Sep 30 16:34:44 2002
@@ -75,8 +75,8 @@ static DynamicConfig &dConfig = DynamicC
+++ Config.h Fri Jun 5 00:51:49 2009
@@ -75,8 +75,8 @@ static DynamicConfig &dConfig = DynamicConfig::dynamic
// What to run to get a new window (from the "New" menu option)
#define CONFIG_NEW_WINDOW_LABEL "New"
@ -12,7 +12,7 @@ $OpenBSD: patch-Config.h,v 1.3 2002/09/30 14:31:50 naddy Exp $
#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
// or, for example,
//#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
@@ -373,7 +373,7 @@ static DynamicConfig &dConfig = DynamicC
@@ -373,7 +373,7 @@ static DynamicConfig &dConfig = DynamicConfig::dynamic
// that you are not currently on, some strange things happen.
// (Patch due to Henri Naccache <henri@asu.edu>)

View File

@ -1,19 +1,7 @@
$OpenBSD: patch-Manager.C,v 1.4 2005/11/13 12:42:25 naddy Exp $
$OpenBSD: patch-Manager.C,v 1.5 2009/06/04 23:37:50 naddy Exp $
--- Manager.C.orig Mon Apr 23 11:10:42 2001
+++ Manager.C Sun Nov 13 13:35:32 2005
@@ -921,6 +921,11 @@ extern "C" {
extern int putenv(char *); /* not POSIX */
}
#endif
+#ifdef __OpenBSD__
+extern "C" {
+extern int putenv(const char *);
+}
+#endif
void WindowManager::spawn(char *name, char *file)
{
@@ -1069,6 +1074,11 @@ void WindowManager::gnomeUpdateWindowLis
+++ Manager.C Fri Jun 5 00:51:49 2009
@@ -1069,6 +1069,11 @@ void WindowManager::gnomeUpdateWindowList()
delete windows;
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Menu_C,v 1.1 2002/09/30 14:31:50 naddy Exp $
--- Menu.C.orig Mon Sep 30 16:19:29 2002
+++ Menu.C Mon Sep 30 16:19:46 2002
@@ -621,7 +621,7 @@ void ClientMenu::raiseFeedbackLevel(int
$OpenBSD: patch-Menu_C,v 1.2 2009/06/04 23:37:50 naddy Exp $
--- Menu.C.orig Wed May 24 17:50:27 2000
+++ Menu.C Fri Jun 5 00:51:49 2009
@@ -621,7 +621,7 @@ void ClientMenu::raiseFeedbackLevel(int item)
CommandMenu::CommandMenu(WindowManager *manager, XEvent *e,

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 19:26:32 espie Exp $
bin/wmx
@comment $OpenBSD: PLIST,v 1.4 2009/06/04 23:37:50 naddy Exp $
@bin bin/wmx
share/doc/wmx/
share/doc/wmx/README