wok-current annotate blackbox/stuff/blackbox-0.70.1-gcc-4.3.patch @ rev 16592

locale-*: fix gconv modules names
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed May 07 01:56:57 2014 +0300 (2014-05-07)
parents
children
rev   line source
pascal@11217 1 diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc
pascal@11217 2 --- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200
pascal@11217 3 +++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100
pascal@11217 4 @@ -42,8 +42,9 @@
pascal@11217 5
pascal@11217 6 #include <assert.h>
pascal@11217 7 #include <math.h>
pascal@11217 8 -#include <stdio.h>
pascal@11217 9 -#include <stdlib.h>
pascal@11217 10 +#include <cstdio>
pascal@11217 11 +#include <cstdlib>
pascal@11217 12 +#include <cstring>
pascal@11217 13
pascal@11217 14 // #define COLORTABLE_DEBUG
pascal@11217 15 // #define MITSHM_DEBUG
pascal@11217 16 diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
pascal@11217 17 --- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200
pascal@11217 18 +++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100
pascal@11217 19 @@ -28,7 +28,8 @@
pascal@11217 20 #include <X11/Xlib.h>
pascal@11217 21 #include <X11/Xresource.h>
pascal@11217 22
pascal@11217 23 -#include <stdio.h>
pascal@11217 24 +#include <cstdio>
pascal@11217 25 +#include <cstring>
pascal@11217 26
pascal@11217 27
pascal@11217 28 bt::Resource::Resource(void)
pascal@11217 29 diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
pascal@11217 30 --- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200
pascal@11217 31 +++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100
pascal@11217 32 @@ -25,7 +25,8 @@
pascal@11217 33 #include "Util.hh"
pascal@11217 34 #include "XDG.hh"
pascal@11217 35
pascal@11217 36 -#include <stdlib.h>
pascal@11217 37 +#include <cstdlib>
pascal@11217 38 +#include <algorithm>
pascal@11217 39
pascal@11217 40
pascal@11217 41 // make sure directory names end with a slash
pascal@11217 42 diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
pascal@11217 43 --- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200
pascal@11217 44 +++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100
pascal@11217 45 @@ -33,6 +33,8 @@
pascal@11217 46 #include <X11/Xutil.h>
pascal@11217 47 #include <X11/cursorfont.h>
pascal@11217 48
pascal@11217 49 +#include <cstring>
pascal@11217 50 +
pascal@11217 51
pascal@11217 52 BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
pascal@11217 53 screen_resources = 0;
pascal@11217 54 diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
pascal@11217 55 --- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100
pascal@11217 56 +++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100
pascal@11217 57 @@ -34,7 +34,8 @@
pascal@11217 58 #include "blackbox.hh"
pascal@11217 59 #include "../version.h"
pascal@11217 60
pascal@11217 61 -#include <stdio.h>
pascal@11217 62 +#include <cstdio>
pascal@11217 63 +#include <cstring>
pascal@11217 64
pascal@11217 65
pascal@11217 66 static void showHelp(int exitval) {
pascal@11217 67 diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
pascal@11217 68 --- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200
pascal@11217 69 +++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100
pascal@11217 70 @@ -45,8 +45,9 @@
pascal@11217 71 #include <sys/types.h>
pascal@11217 72 #include <sys/stat.h>
pascal@11217 73 #include <assert.h>
pascal@11217 74 -#include <ctype.h>
pascal@11217 75 #include <dirent.h>
pascal@11217 76 +#include <cctype>
pascal@11217 77 +#include <cstring>
pascal@11217 78
pascal@11217 79
pascal@11217 80 static bool running = true;
pascal@11217 81 diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
pascal@11217 82 --- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200
pascal@11217 83 +++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100
pascal@11217 84 @@ -33,6 +33,8 @@
pascal@11217 85
pascal@11217 86 #include <assert.h>
pascal@11217 87
pascal@11217 88 +#include <cstring>
pascal@11217 89 +
pascal@11217 90
pascal@11217 91 static const int iconify_width = 9;
pascal@11217 92 static const int iconify_height = 9;
pascal@11217 93 diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
pascal@11217 94 --- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100
pascal@11217 95 +++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100
pascal@11217 96 @@ -30,7 +30,9 @@
pascal@11217 97 #include <cctype>
pascal@11217 98
pascal@11217 99 #include <X11/Xatom.h>
pascal@11217 100 -#include <stdio.h>
pascal@11217 101 +#include <cstdio>
pascal@11217 102 +#include <cstdlib>
pascal@11217 103 +#include <cstring>
pascal@11217 104
pascal@11217 105
pascal@11217 106 // ignore all X errors