3 files changed, 68 insertions, 0 deletions
diff --git a/wm/openbox2/patches/patch-ae b/wm/openbox2/patches/patch-ae
new file mode 100644
index 00000000000..61237e7e693
--- /dev/null
+++ b/wm/openbox2/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2006/01/02 22:05:38 joerg Exp $
+
+--- src/Timer.hh.orig	2006-01-02 21:42:01.000000000 +0000
++++ src/Timer.hh
+@@ -98,9 +98,9 @@ public:
+   ~_timer_queue(void) {}
+ 
+   void release(const _Tp& value) {
+-    c.erase(std::remove(c.begin(), c.end(), value), c.end());
++    this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end());
+     // after removing the item we need to make the heap again
+-    std::make_heap(c.begin(), c.end(), comp);
++    std::make_heap(this->c.begin(), this->c.end(), this->comp);
+   }
+   bool empty(void) const { return _Base::empty(); }
+   size_t size(void) const { return _Base::size(); }
diff --git a/wm/openbox2/patches/patch-af b/wm/openbox2/patches/patch-af
new file mode 100644
index 00000000000..ad3d6099da9
--- /dev/null
+++ b/wm/openbox2/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2006/01/02 22:05:38 joerg Exp $
+
+--- util/epist/window.cc.orig	2006-01-02 21:54:28.000000000 +0000
++++ util/epist/window.cc
+@@ -166,9 +166,12 @@ void XWindow::updateState() {
+ 
+ 
+ void XWindow::updateDesktop() {
++  unsigned long tmp_desktop = _desktop;
+   if (! _xatom->getValue(_window, XAtom::net_wm_desktop, XAtom::cardinal,
+-                         static_cast<unsigned long>(_desktop)))
++                         tmp_desktop))
+     _desktop = 0;
++  else
++    _desktop = tmp_desktop;
+ }
+ 
+ 
diff --git a/wm/openbox2/patches/patch-ag b/wm/openbox2/patches/patch-ag
new file mode 100644
index 00000000000..48ed38fae9e
--- /dev/null
+++ b/wm/openbox2/patches/patch-ag
@@ -0,0 +1,34 @@
+$NetBSD: patch-ag,v 1.1 2006/01/02 22:05:38 joerg Exp $
+
+--- util/epist/screen.cc.orig	2006-01-02 21:58:13.000000000 +0000
++++ util/epist/screen.cc
+@@ -435,19 +435,27 @@ void screen::updateEverything() {
+ void screen::updateNumDesktops() {
+   assert(_managed);
+ 
++  unsigned long tmp_num_desktops = _num_desktops;
++
+   if (! _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
+-                         (unsigned long)_num_desktops))
++                         tmp_num_desktops))
+     _num_desktops = 1;  // assume that there is at least 1 desktop!
++  else
++    _num_desktops = tmp_num_desktops;
+ }
+ 
+ 
+ void screen::updateActiveDesktop() {
+   assert(_managed);
+ 
++  unsigned long tmp_active_desktop = _active_desktop;
++
+   if (! _xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal,
+-                         (unsigned long)_active_desktop))
++                         tmp_active_desktop))
+     _active_desktop = 0;  // there must be at least one desktop, and it must
+                           // be the current one
++  else
++    _active_desktop = tmp_active_desktop;
+ }
+ 
+