Try to fix build problem on NetBSD 4.

4 files changed, 52 insertions, 1 deletions

diff --git a/wm/wmi/distinfo b/wm/wmi/distinfo
index b4ffbc6096d..fd690b23064 100644
--- a/wm/wmi/distinfo
+++ b/wm/wmi/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:43:56 wiz Exp $
+$NetBSD: distinfo,v 1.6 2007/12/10 13:25:03 obache Exp $
 
 SHA1 (wmi-10.tar.gz) = 46fbafc5d896863f5e22c2d7c77244b21fbd5d35
 RMD160 (wmi-10.tar.gz) = 49ba3c481c6149a815c89d9de5f3233ede25edeb
 Size (wmi-10.tar.gz) = 193148 bytes
+SHA1 (patch-ab) = d0112ad98f1812aa9be96f0531670a02d01de71f
+SHA1 (patch-ac) = cc10b19adf1867926a4bc15de12f64172d3ddcae
+SHA1 (patch-ad) = 91cab093a6111b05652a614b6f160a28617279b3
diff --git a/wm/wmi/patches/patch-ab b/wm/wmi/patches/patch-ab
new file mode 100644
index 00000000000..9668edc8fb3
--- /dev/null
+++ b/wm/wmi/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/12/10 13:25:08 obache Exp $
+
+--- src/kernel.h.orig	2004-09-27 18:22:51.000000000 +0000
++++ src/kernel.h
+@@ -167,7 +167,7 @@ public:
+ 
+     void cleanup();
+ 
+-    Prompt *Kernel::defaultPrompt() const;
++    Prompt *defaultPrompt() const;
+ 
+     void setMenuMode(bool isMenuMode);
+ 
diff --git a/wm/wmi/patches/patch-ac b/wm/wmi/patches/patch-ac
new file mode 100644
index 00000000000..9ad7b9bf822
--- /dev/null
+++ b/wm/wmi/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/12/10 13:25:10 obache Exp $
+
+--- src/frame.h.orig	2004-09-27 18:22:51.000000000 +0000
++++ src/frame.h
+@@ -35,7 +35,7 @@ public:
+     void focus(Client *client);
+ 
+     void attach(Client *client);
+-    Client *Frame::detach(Client *client);
++    Client *detach(Client *client);
+ 
+     virtual Window window();
+ 
diff --git a/wm/wmi/patches/patch-ad b/wm/wmi/patches/patch-ad
new file mode 100644
index 00000000000..3a44276df0e
--- /dev/null
+++ b/wm/wmi/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2007/12/10 13:25:10 obache Exp $
+
+--- src/inputbar.cpp.orig	2004-09-27 18:22:51.000000000 +0000
++++ src/inputbar.cpp
+@@ -31,7 +31,7 @@ InputBar::InputBar(Monitor *monitor, Rec
+     prompt_ = 0;
+     promptCounter_ = 0;
+     isArgument_ = false;
+-    entryBegin_ = entryEnd_ = 0;
++    entryBegin_ = entryEnd_ = names_.end();
+     partitionBegin_ = selected_ = entryBegin_;
+     args_ = "";
+     LOGDEBUG("creating input");
+@@ -233,7 +233,7 @@ void InputBar::queryText(string text) {
+         clearPrevPartitionsStack();
+     }
+     else {
+-        entryBegin_ = entryEnd_ = 0;
++        entryBegin_ = entryEnd_ = names_.end();
+         partitionBegin_ = selected_ = entryBegin_;
+         text_ = text;
+     }