Fixed build failures with sunpro.

4 files changed, 121 insertions, 1 deletions

diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo
index b4cbe4a3d78..c53a5e8e530 100644
--- a/wm/blackbox70/distinfo
+++ b/wm/blackbox70/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1 2006/08/20 23:07:17 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2008/01/14 02:04:41 rillig Exp $
 
 SHA1 (blackbox-0.70.1.tar.gz) = f0ab7e4b44ae6ee4c2a2136651afc567c47fe2cd
 RMD160 (blackbox-0.70.1.tar.gz) = ab80c43d42dbfac23c9f981885f25a42c66f51a6
 Size (blackbox-0.70.1.tar.gz) = 650400 bytes
+SHA1 (patch-aa) = 24a333e964dea6c0707df681ce14153ef158b305
+SHA1 (patch-ab) = 30633230592a0b81002bdddbb1128694acde9d10
+SHA1 (patch-ac) = f4ad9466b09f01bc90c1cd0bc036ce6c397e6609
diff --git a/wm/blackbox70/patches/patch-aa b/wm/blackbox70/patches/patch-aa
new file mode 100644
index 00000000000..0271fa7e7cf
--- /dev/null
+++ b/wm/blackbox70/patches/patch-aa
@@ -0,0 +1,49 @@
+$NetBSD: patch-aa,v 1.1 2008/01/14 02:04:41 rillig Exp $
+
+Sunpro cannot resolve sqrt(int) to either sqrt(double) or
+sqrt(long double).
+
+--- lib/Image.cc.orig	2005-04-08 17:41:09.000000000 +0200
++++ lib/Image.cc	2007-12-05 16:04:26.019637000 +0100
+@@ -1694,14 +1694,14 @@ void bt::Image::egradient(const Color &f
+     for (y = 0; y < height; ++y) {
+       for (x = 0; x < width; ++x, ++p) {
+         p->red   = static_cast<unsigned char>
+-                   (tr - (rsign * static_cast<int>(sqrt(xt[0][x] +
+-                                                        yt[0][y]))));
++                   (tr - (rsign * static_cast<int>(sqrt(double(xt[0][x] +
++                                                        yt[0][y])))));
+         p->green = static_cast<unsigned char>
+-                   (tg - (gsign * static_cast<int>(sqrt(xt[1][x] +
+-                                                        yt[1][y]))));
++                   (tg - (gsign * static_cast<int>(sqrt(double(xt[1][x] +
++                                                        yt[1][y])))));
+         p->blue  = static_cast<unsigned char>
+-                   (tb - (bsign * static_cast<int>(sqrt(xt[2][x] +
+-                                                        yt[2][y]))));
++                   (tb - (bsign * static_cast<int>(sqrt(double(xt[2][x] +
++                                                        yt[2][y])))));
+       }
+     }
+   } else {
+@@ -1709,14 +1709,14 @@ void bt::Image::egradient(const Color &f
+     for (y = 0; y < height; ++y) {
+       for (x = 0; x < width; ++x, ++p) {
+         p->red   = static_cast<unsigned char>
+-                   (tr - (rsign * static_cast<int>(sqrt(xt[0][x]
+-                                                        + yt[0][y]))));
++                   (tr - (rsign * static_cast<int>(sqrt(double(xt[0][x]
++                                                        + yt[0][y])))));
+         p->green = static_cast<unsigned char>
+-                   (tg - (gsign * static_cast<int>(sqrt(xt[1][x]
+-                                                        + yt[1][y]))));
++                   (tg - (gsign * static_cast<int>(sqrt(double(xt[1][x]
++                                                        + yt[1][y])))));
+         p->blue  = static_cast<unsigned char>
+-                   (tb - (bsign * static_cast<int>(sqrt(xt[2][x]
+-                                                        + yt[2][y]))));
++                   (tb - (bsign * static_cast<int>(sqrt(double(xt[2][x]
++                                                        + yt[2][y])))));
+ 
+         if (y & 1) {
+           p->red   = (p->red   >> 1) + (p->red   >> 2);
diff --git a/wm/blackbox70/patches/patch-ab b/wm/blackbox70/patches/patch-ab
new file mode 100644
index 00000000000..c4bc700cbbd
--- /dev/null
+++ b/wm/blackbox70/patches/patch-ab
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.1 2008/01/14 02:04:41 rillig Exp $
+
+Sunpro has problems with a non-const const_reverse_iterator.
+
+--- lib/Menu.cc.orig	2005-01-27 18:08:22.000000000 +0100
++++ lib/Menu.cc	2007-12-05 16:08:11.094236000 +0100
+@@ -1052,10 +1052,10 @@ void bt::Menu::keyPressEvent(const XKeyE
+   }
+ 
+   case XK_Up: {
+-    ItemList::const_reverse_iterator anchor = _items.rbegin();
+-    const ItemList::const_reverse_iterator &end = _items.rend();
++    ItemList::reverse_iterator anchor = _items.rbegin();
++    const ItemList::reverse_iterator &end = _items.rend();
+     if (_active_index != ~0u) {
+-      std::advance<ItemList::const_reverse_iterator, signed>
++      std::advance<ItemList::reverse_iterator, signed>
+         (anchor, _items.size() - _active_index - 1);
+ 
+       // go one item past the current active index
+@@ -1065,7 +1065,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+ 
+     if (anchor == end) anchor = _items.rbegin();
+ 
+-    ItemList::const_reverse_iterator it =
++    ItemList::reverse_iterator it =
+       std::find_if(anchor, end, InteractMatch());
+     if (it != end)
+       activateIndex(it->indx);
+@@ -1073,8 +1073,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+   }
+ 
+   case XK_Home: {
+-    const ItemList::const_iterator &end = _items.end();
+-    ItemList::const_iterator it = _items.begin();
++    const ItemList::iterator &end = _items.end();
++    ItemList::iterator it = _items.begin();
+     it = std::find_if(it, end, InteractMatch());
+     if (it != end)
+       activateIndex(it->indx);
+@@ -1082,8 +1082,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+   }
+ 
+   case XK_End: {
+-    const ItemList::const_reverse_iterator &end = _items.rend();
+-    ItemList::const_reverse_iterator it = _items.rbegin();
++    const ItemList::reverse_iterator &end = _items.rend();
++    ItemList::reverse_iterator it = _items.rbegin();
+     it = std::find_if(it, end, InteractMatch());
+     if (it != end)
+       activateIndex(it->indx);
diff --git a/wm/blackbox70/patches/patch-ac b/wm/blackbox70/patches/patch-ac
new file mode 100644
index 00000000000..eb4a003f73f
--- /dev/null
+++ b/wm/blackbox70/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2008/01/14 02:04:41 rillig Exp $
+
+Sunpro has problems with a non-const const_reverse_iterator.
+
+--- src/Screen.cc.orig	2005-10-18 10:07:22.000000000 +0200
++++ src/Screen.cc	2007-12-05 16:25:38.677507000 +0100
+@@ -492,8 +492,8 @@ void BScreen::setCurrentWorkspace(unsign
+ 
+     // withdraw windows in reverse order to minimize the number of
+     // Expose events
+-    StackingList::const_reverse_iterator it = _stackingList.rbegin();
+-    const StackingList::const_reverse_iterator end = _stackingList.rend();
++    StackingList::reverse_iterator it = _stackingList.rbegin();
++    const StackingList::reverse_iterator end = _stackingList.rend();
+     for (; it != end; ++it) {
+       BlackboxWindow *win = dynamic_cast<BlackboxWindow *>(*it);
+       if (win && win->workspace() == current_workspace)