From f03f1e7c738cfcac9663b00503120ab8b725f66f Mon Sep 17 00:00:00 2001
From: sibel <lesibel@free.fr>
Date: Thu, 20 Jan 2011 15:04:35 +0100
Subject: blackbox, correction patch

---
 extra/blackbox/.md5sum              |   2 +-
 extra/blackbox/Pkgfile              |   6 +-
 extra/blackbox/blackbox-gcc43.patch | 111 ++++++++++++++++++++++++++++++++++++
 3 files changed, 115 insertions(+), 4 deletions(-)
 create mode 100644 extra/blackbox/blackbox-gcc43.patch

(limited to 'extra/blackbox')

diff --git a/extra/blackbox/.md5sum b/extra/blackbox/.md5sum
index c1bad69ae..18e56cdfe 100644
--- a/extra/blackbox/.md5sum
+++ b/extra/blackbox/.md5sum
@@ -1,2 +1,2 @@
 53b84260b9d38b35fb25b4baf7bb795a  blackbox-0.70.1.tar.bz2
-58c53c773dcf7d80532c7501a6a3a9ef  gcc43.patch
+bc7a1335d77cdeb6f85cba4d01e68e63  blackbox-gcc43.patch
diff --git a/extra/blackbox/Pkgfile b/extra/blackbox/Pkgfile
index 01fd8b0ed..d22cc5eeb 100644
--- a/extra/blackbox/Pkgfile
+++ b/extra/blackbox/Pkgfile
@@ -8,12 +8,12 @@
 name=blackbox
 version=0.70.1
 release=3
-source=(http://downloads.sourceforge.net/blackboxwm/$name-$version.tar.bz2\
-	http://nutyx.meticul.eu/files/patchs/$name/gcc43.patch)
+source=(http://downloads.sourceforge.net/blackboxwm/$name-$version.tar.bz2 
+	$name-gcc43.patch)
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../gcc43.patch
+	patch -Np1 -i ../$name-gcc43.patch
 	./configure --prefix=/usr\
 	--mandir=/usr/share/man
 	make
diff --git a/extra/blackbox/blackbox-gcc43.patch b/extra/blackbox/blackbox-gcc43.patch
new file mode 100644
index 000000000..40a9dcdef
--- /dev/null
+++ b/extra/blackbox/blackbox-gcc43.patch
@@ -0,0 +1,111 @@
+diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc
+--- blackbox-0.70.1/lib/Image.cc	2005-04-08 08:41:09.000000000 -0700
++++ blackbox-0.70.1-new/lib/Image.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -45,6 +45,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#include <cstring>
++
+ // #define COLORTABLE_DEBUG
+ // #define MITSHM_DEBUG
+ 
+diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc
+--- blackbox-0.70.1/lib/Resource.cc	2005-04-06 14:16:50.000000000 -0700
++++ blackbox-0.70.1-new/lib/Resource.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -30,6 +30,8 @@
+ 
+ #include <stdio.h>
+ 
++#include <cstring>
++
+ 
+ bt::Resource::Resource(void)
+   : db(NULL)
+diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc
+--- blackbox-0.70.1/lib/XDG.cc	2005-04-06 07:04:38.000000000 -0700
++++ blackbox-0.70.1-new/lib/XDG.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -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 -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc
+--- blackbox-0.70.1/src/BlackboxResource.cc	2005-10-18 00:34:46.000000000 -0700
++++ blackbox-0.70.1-new/src/BlackboxResource.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -33,6 +33,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <cstring>
++
+ 
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
+   screen_resources = 0;
+diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc
+--- blackbox-0.70.1/src/Screen.cc	2005-10-18 01:07:22.000000000 -0700
++++ blackbox-0.70.1-new/src/Screen.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -48,6 +48,8 @@
+ #include <ctype.h>
+ #include <dirent.h>
+ 
++#include <cstring>
++
+ 
+ static bool running = true;
+ static int anotherWMRunning(Display *, XErrorEvent *) {
+diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc
+--- blackbox-0.70.1/src/ScreenResource.cc	2005-04-12 22:54:08.000000000 -0700
++++ blackbox-0.70.1-new/src/ScreenResource.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -33,6 +33,8 @@
+ 
+ #include <assert.h>
+ 
++#include <cstring>
++
+ 
+ static const int iconify_width  = 9;
+ static const int iconify_height = 9;
+diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc
+--- blackbox-0.70.1/src/main.cc	2005-01-03 02:42:57.000000000 -0700
++++ blackbox-0.70.1-new/src/main.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -36,6 +36,8 @@
+ 
+ #include <stdio.h>
+ 
++#include <cstring>
++
+ 
+ static void showHelp(int exitval) {
+   // print version - this should not be localized!
+diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg
+--- blackbox-0.70.1/util/bsetbg	2004-12-22 02:40:18.000000000 -0700
++++ blackbox-0.70.1-new/util/bsetbg	2008-05-21 20:52:44.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com)
+ #
+diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc
+--- blackbox-0.70.1/util/bsetroot.cc	2005-03-15 00:01:37.000000000 -0700
++++ blackbox-0.70.1-new/util/bsetroot.cc	2008-05-21 20:52:44.000000000 -0700
+@@ -27,11 +27,14 @@
+ #include <Pen.hh>
+ #include <Texture.hh>
+ 
++#include <cstdlib>
+ #include <cctype>
+ 
+ #include <X11/Xatom.h>
+ #include <stdio.h>
+ 
++#include <cstring>
++
+ 
+ // ignore all X errors
+ static int x11_error(::Display *, XErrorEvent *)
-- 
cgit v1.2.3-70-g09d2