wok view blackbox/stuff/blackbox-0.70.1-gcc-4.3.patch @ rev 19200

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