blackbox: fix compilation with 4.3.2, this time for real

2 files changed, 67 insertions, 1 deletions

diff --git a/blackbox/.md5sum b/blackbox/.md5sum
index ce7a479b5..d10388024 100644
--- a/blackbox/.md5sum
+++ b/blackbox/.md5sum
@@ -1,2 +1,2 @@
-613c3a6497dd6471749f1a7b8ba066a3  blackbox-0.70.1-include-fix.diff
+150aab3b2b8d8dd5fc30d00f8d79e387  blackbox-0.70.1-include-fix.diff
 53b84260b9d38b35fb25b4baf7bb795a  blackbox-0.70.1.tar.bz2
diff --git a/blackbox/blackbox-0.70.1-include-fix.diff b/blackbox/blackbox-0.70.1-include-fix.diff
index fad7497ce..63c75bd8f 100644
--- a/blackbox/blackbox-0.70.1-include-fix.diff
+++ b/blackbox/blackbox-0.70.1-include-fix.diff
@@ -18,3 +18,69 @@
  
  
  bt::Resource::Resource(void)
+--- blackbox-0.70.1.orig/lib/XDG.cc	2008-10-07 18:32:55.000000000 +0200
++++ blackbox-0.70.1/lib/XDG.cc	2008-10-07 18:47:25.000000000 +0200
+@@ -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)
+--- blackbox-0.70.1.orig/src/BlackboxResource.cc	2008-10-07 18:32:55.000000000 +0200
++++ blackbox-0.70.1/src/BlackboxResource.cc	2008-10-07 18:48:13.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <strings.h>
+ 
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
+   screen_resources = 0;
+--- blackbox-0.70.1.orig/src/ScreenResource.cc	2008-10-07 18:32:55.000000000 +0200
++++ blackbox-0.70.1/src/ScreenResource.cc	2008-10-07 18:49:10.000000000 +0200
+@@ -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;
+--- blackbox-0.70.1.orig/src/Screen.cc	2008-10-07 18:32:55.000000000 +0200
++++ blackbox-0.70.1/src/Screen.cc	2008-10-07 18:50:01.000000000 +0200
+@@ -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 *) {
+--- blackbox-0.70.1.orig/src/main.cc	2008-10-07 18:32:55.000000000 +0200
++++ blackbox-0.70.1/src/main.cc	2008-10-07 18:50:48.000000000 +0200
+@@ -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!
+--- blackbox-0.70.1.orig/util/bsetroot.cc	2008-10-07 18:32:55.000000000 +0200
++++ blackbox-0.70.1/util/bsetroot.cc	2008-10-07 18:52:33.000000000 +0200
+@@ -31,7 +31,8 @@
+ 
+ #include <X11/Xatom.h>
+ #include <stdio.h>
+-
++#include <string.h>
++#include <stdlib.h>
+ 
+ // ignore all X errors
+ static int x11_error(::Display *, XErrorEvent *)