wok-6.x diff blackbox/stuff/blackbox-0.70.1-gcc-4.3.patch @ rev 11355
Up tinc (1.0.16)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Dec 01 11:38:36 2011 +0100 (2011-12-01) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/blackbox/stuff/blackbox-0.70.1-gcc-4.3.patch Thu Dec 01 11:38:36 2011 +0100 1.3 @@ -0,0 +1,106 @@ 1.4 +diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc 1.5 +--- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200 1.6 ++++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100 1.7 +@@ -42,8 +42,9 @@ 1.8 + 1.9 + #include <assert.h> 1.10 + #include <math.h> 1.11 +-#include <stdio.h> 1.12 +-#include <stdlib.h> 1.13 ++#include <cstdio> 1.14 ++#include <cstdlib> 1.15 ++#include <cstring> 1.16 + 1.17 + // #define COLORTABLE_DEBUG 1.18 + // #define MITSHM_DEBUG 1.19 +diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc 1.20 +--- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200 1.21 ++++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100 1.22 +@@ -28,7 +28,8 @@ 1.23 + #include <X11/Xlib.h> 1.24 + #include <X11/Xresource.h> 1.25 + 1.26 +-#include <stdio.h> 1.27 ++#include <cstdio> 1.28 ++#include <cstring> 1.29 + 1.30 + 1.31 + bt::Resource::Resource(void) 1.32 +diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc 1.33 +--- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200 1.34 ++++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100 1.35 +@@ -25,7 +25,8 @@ 1.36 + #include "Util.hh" 1.37 + #include "XDG.hh" 1.38 + 1.39 +-#include <stdlib.h> 1.40 ++#include <cstdlib> 1.41 ++#include <algorithm> 1.42 + 1.43 + 1.44 + // make sure directory names end with a slash 1.45 +diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc 1.46 +--- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200 1.47 ++++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100 1.48 +@@ -33,6 +33,8 @@ 1.49 + #include <X11/Xutil.h> 1.50 + #include <X11/cursorfont.h> 1.51 + 1.52 ++#include <cstring> 1.53 ++ 1.54 + 1.55 + BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { 1.56 + screen_resources = 0; 1.57 +diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc 1.58 +--- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100 1.59 ++++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100 1.60 +@@ -34,7 +34,8 @@ 1.61 + #include "blackbox.hh" 1.62 + #include "../version.h" 1.63 + 1.64 +-#include <stdio.h> 1.65 ++#include <cstdio> 1.66 ++#include <cstring> 1.67 + 1.68 + 1.69 + static void showHelp(int exitval) { 1.70 +diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc 1.71 +--- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200 1.72 ++++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100 1.73 +@@ -45,8 +45,9 @@ 1.74 + #include <sys/types.h> 1.75 + #include <sys/stat.h> 1.76 + #include <assert.h> 1.77 +-#include <ctype.h> 1.78 + #include <dirent.h> 1.79 ++#include <cctype> 1.80 ++#include <cstring> 1.81 + 1.82 + 1.83 + static bool running = true; 1.84 +diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc 1.85 +--- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200 1.86 ++++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100 1.87 +@@ -33,6 +33,8 @@ 1.88 + 1.89 + #include <assert.h> 1.90 + 1.91 ++#include <cstring> 1.92 ++ 1.93 + 1.94 + static const int iconify_width = 9; 1.95 + static const int iconify_height = 9; 1.96 +diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc 1.97 +--- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100 1.98 ++++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100 1.99 +@@ -30,7 +30,9 @@ 1.100 + #include <cctype> 1.101 + 1.102 + #include <X11/Xatom.h> 1.103 +-#include <stdio.h> 1.104 ++#include <cstdio> 1.105 ++#include <cstdlib> 1.106 ++#include <cstring> 1.107 + 1.108 + 1.109 + // ignore all X errors