Fix build with newer GCC.

9 files changed, 111 insertions, 11 deletions

diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo
index a612459f560..3e4953e2359 100644
--- a/wm/blackbox70/distinfo
+++ b/wm/blackbox70/distinfo
@@ -1,9 +1,15 @@
-$NetBSD: distinfo,v 1.3 2011/09/24 13:01:28 joerg Exp $
+$NetBSD: distinfo,v 1.4 2011/11/22 20:02:48 joerg 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-aa) = 36e90d9a54329009c1d1fd9788ebe349858578b3
 SHA1 (patch-ab) = 30633230592a0b81002bdddbb1128694acde9d10
-SHA1 (patch-ac) = f4ad9466b09f01bc90c1cd0bc036ce6c397e6609
+SHA1 (patch-ac) = 5f7132230ab4c53bf5042a274592bae45c6a15ed
+SHA1 (patch-lib-Resource.cc) = 8ac7fee379aa940f85c7800572be5ee3bb4202c5
 SHA1 (patch-lib-Util.hh) = b0bbf923ee06d200666ce96b6bf5ad648b361fd8
+SHA1 (patch-lib-XDG.cc) = 55422803fd20b8f100816a204de7af22f00ba51c
+SHA1 (patch-src-BlackboxResource.cc) = 66d022f7a91f2054c45c3f38a0fe98da4ddce3de
+SHA1 (patch-src-ScreenResource.cc) = ec09befadf9e92bd9e9543f7e9b472639bf6e8d5
+SHA1 (patch-src-main.cc) = 1b004b5860473300afc02fa50d6fc89523ab1b59
+SHA1 (patch-util-bsetroot.cc) = 87b3e5aab03facfce88286f25df14580c39582c6
diff --git a/wm/blackbox70/patches/patch-aa b/wm/blackbox70/patches/patch-aa
index 0271fa7e7cf..e018dc85d09 100644
--- a/wm/blackbox70/patches/patch-aa
+++ b/wm/blackbox70/patches/patch-aa
@@ -1,11 +1,19 @@
-$NetBSD: patch-aa,v 1.1 2008/01/14 02:04:41 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/22 20:02:48 joerg 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
+--- lib/Image.cc.orig	2005-04-08 15:41:09.000000000 +0000
++++ lib/Image.cc
+@@ -44,6 +44,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ // #define COLORTABLE_DEBUG
+ // #define MITSHM_DEBUG
+@@ -1694,14 +1695,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>
@@ -26,7 +34,7 @@ sqrt(long double).
        }
      }
    } else {
-@@ -1709,14 +1709,14 @@ void bt::Image::egradient(const Color &f
+@@ -1709,14 +1710,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>
diff --git a/wm/blackbox70/patches/patch-ac b/wm/blackbox70/patches/patch-ac
index eb4a003f73f..4dfe2b0da1c 100644
--- a/wm/blackbox70/patches/patch-ac
+++ b/wm/blackbox70/patches/patch-ac
@@ -1,9 +1,18 @@
-$NetBSD: patch-ac,v 1.1 2008/01/14 02:04:41 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2011/11/22 20:02:48 joerg 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
+--- src/Screen.cc.orig	2005-10-18 08:07:22.000000000 +0000
++++ src/Screen.cc
+@@ -47,7 +47,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <dirent.h>
+-
++#include <string.h>
+ 
+ static bool running = true;
+ static int anotherWMRunning(Display *, XErrorEvent *) {
 @@ -492,8 +492,8 @@ void BScreen::setCurrentWorkspace(unsign
  
      // withdraw windows in reverse order to minimize the number of
diff --git a/wm/blackbox70/patches/patch-lib-Resource.cc b/wm/blackbox70/patches/patch-lib-Resource.cc
new file mode 100644
index 00000000000..0c344257138
--- /dev/null
+++ b/wm/blackbox70/patches/patch-lib-Resource.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib-Resource.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
+
+--- lib/Resource.cc.orig	2011-11-22 18:36:20.000000000 +0000
++++ lib/Resource.cc
+@@ -29,6 +29,7 @@
+ #include <X11/Xresource.h>
+ 
+ #include <stdio.h>
++#include <strings.h>
+ 
+ 
+ bt::Resource::Resource(void)
diff --git a/wm/blackbox70/patches/patch-lib-XDG.cc b/wm/blackbox70/patches/patch-lib-XDG.cc
new file mode 100644
index 00000000000..eab1dca138f
--- /dev/null
+++ b/wm/blackbox70/patches/patch-lib-XDG.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib-XDG.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
+
+--- lib/XDG.cc.orig	2011-11-22 18:41:39.000000000 +0000
++++ lib/XDG.cc
+@@ -26,7 +26,7 @@
+ #include "XDG.hh"
+ 
+ #include <stdlib.h>
+-
++#include <algorithm>
+ 
+ // make sure directory names end with a slash
+ static std::string terminateDir(const std::string &string)
diff --git a/wm/blackbox70/patches/patch-src-BlackboxResource.cc b/wm/blackbox70/patches/patch-src-BlackboxResource.cc
new file mode 100644
index 00000000000..fc8dc8e1ee5
--- /dev/null
+++ b/wm/blackbox70/patches/patch-src-BlackboxResource.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src-BlackboxResource.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
+
+--- src/BlackboxResource.cc.orig	2011-11-22 18:43:51.000000000 +0000
++++ src/BlackboxResource.cc
+@@ -32,6 +32,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
++#include <strings.h>
+ 
+ 
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
diff --git a/wm/blackbox70/patches/patch-src-ScreenResource.cc b/wm/blackbox70/patches/patch-src-ScreenResource.cc
new file mode 100644
index 00000000000..deeb6669cab
--- /dev/null
+++ b/wm/blackbox70/patches/patch-src-ScreenResource.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src-ScreenResource.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
+
+--- src/ScreenResource.cc.orig	2011-11-22 18:52:35.000000000 +0000
++++ src/ScreenResource.cc
+@@ -32,7 +32,7 @@
+ #include <Resource.hh>
+ 
+ #include <assert.h>
+-
++#include <strings.h>
+ 
+ static const int iconify_width  = 9;
+ static const int iconify_height = 9;
diff --git a/wm/blackbox70/patches/patch-src-main.cc b/wm/blackbox70/patches/patch-src-main.cc
new file mode 100644
index 00000000000..446077ec105
--- /dev/null
+++ b/wm/blackbox70/patches/patch-src-main.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src-main.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
+
+--- src/main.cc.orig	2011-11-22 18:56:19.000000000 +0000
++++ src/main.cc
+@@ -35,7 +35,7 @@
+ #include "../version.h"
+ 
+ #include <stdio.h>
+-
++#include <string.h>
+ 
+ static void showHelp(int exitval) {
+   // print version - this should not be localized!
diff --git a/wm/blackbox70/patches/patch-util-bsetroot.cc b/wm/blackbox70/patches/patch-util-bsetroot.cc
new file mode 100644
index 00000000000..173592cfe8e
--- /dev/null
+++ b/wm/blackbox70/patches/patch-util-bsetroot.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-util-bsetroot.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
+
+--- util/bsetroot.cc.orig	2011-11-22 19:00:21.000000000 +0000
++++ util/bsetroot.cc
+@@ -31,7 +31,8 @@
+ 
+ #include <X11/Xatom.h>
+ #include <stdio.h>
+-
++#include <stdlib.h>
++#include <string.h>
+ 
+ // ignore all X errors
+ static int x11_error(::Display *, XErrorEvent *)