| 1 |
omp 08/04/24 08:57:33 |
| 2 |
|
| 3 |
Added: blackbox-0.70.1-gcc-4.3.patch |
| 4 |
Log: |
| 5 |
Compile with GCC 4.3; patch from Fedora. (bug #217978) |
| 6 |
(Portage version: 2.1.5_rc3) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: blackbox-0.70.1-gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc |
| 17 |
--- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200 |
| 18 |
+++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100 |
| 19 |
@@ -42,8 +42,9 @@ |
| 20 |
|
| 21 |
#include <assert.h> |
| 22 |
#include <math.h> |
| 23 |
-#include <stdio.h> |
| 24 |
-#include <stdlib.h> |
| 25 |
+#include <cstdio> |
| 26 |
+#include <cstdlib> |
| 27 |
+#include <cstring> |
| 28 |
|
| 29 |
// #define COLORTABLE_DEBUG |
| 30 |
// #define MITSHM_DEBUG |
| 31 |
diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc |
| 32 |
--- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200 |
| 33 |
+++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100 |
| 34 |
@@ -28,7 +28,8 @@ |
| 35 |
#include <X11/Xlib.h> |
| 36 |
#include <X11/Xresource.h> |
| 37 |
|
| 38 |
-#include <stdio.h> |
| 39 |
+#include <cstdio> |
| 40 |
+#include <cstring> |
| 41 |
|
| 42 |
|
| 43 |
bt::Resource::Resource(void) |
| 44 |
diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc |
| 45 |
--- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200 |
| 46 |
+++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100 |
| 47 |
@@ -25,7 +25,8 @@ |
| 48 |
#include "Util.hh" |
| 49 |
#include "XDG.hh" |
| 50 |
|
| 51 |
-#include <stdlib.h> |
| 52 |
+#include <cstdlib> |
| 53 |
+#include <algorithm> |
| 54 |
|
| 55 |
|
| 56 |
// make sure directory names end with a slash |
| 57 |
diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc |
| 58 |
--- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200 |
| 59 |
+++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100 |
| 60 |
@@ -33,6 +33,8 @@ |
| 61 |
#include <X11/Xutil.h> |
| 62 |
#include <X11/cursorfont.h> |
| 63 |
|
| 64 |
+#include <cstring> |
| 65 |
+ |
| 66 |
|
| 67 |
BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { |
| 68 |
screen_resources = 0; |
| 69 |
diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc |
| 70 |
--- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100 |
| 71 |
+++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100 |
| 72 |
@@ -34,7 +34,8 @@ |
| 73 |
#include "blackbox.hh" |
| 74 |
#include "../version.h" |
| 75 |
|
| 76 |
-#include <stdio.h> |
| 77 |
+#include <cstdio> |
| 78 |
+#include <cstring> |
| 79 |
|
| 80 |
|
| 81 |
static void showHelp(int exitval) { |
| 82 |
diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc |
| 83 |
--- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200 |
| 84 |
+++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100 |
| 85 |
@@ -45,8 +45,9 @@ |
| 86 |
#include <sys/types.h> |
| 87 |
#include <sys/stat.h> |
| 88 |
#include <assert.h> |
| 89 |
-#include <ctype.h> |
| 90 |
#include <dirent.h> |
| 91 |
+#include <cctype> |
| 92 |
+#include <cstring> |
| 93 |
|
| 94 |
|
| 95 |
static bool running = true; |
| 96 |
diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc |
| 97 |
--- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200 |
| 98 |
+++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100 |
| 99 |
@@ -33,6 +33,8 @@ |
| 100 |
|
| 101 |
#include <assert.h> |
| 102 |
|
| 103 |
+#include <cstring> |
| 104 |
+ |
| 105 |
|
| 106 |
static const int iconify_width = 9; |
| 107 |
static const int iconify_height = 9; |
| 108 |
diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc |
| 109 |
--- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100 |
| 110 |
+++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100 |
| 111 |
@@ -30,7 +30,9 @@ |
| 112 |
#include <cctype> |
| 113 |
|
| 114 |
#include <X11/Xatom.h> |
| 115 |
-#include <stdio.h> |
| 116 |
+#include <cstdio> |
| 117 |
+#include <cstdlib> |
| 118 |
+#include <cstring> |
| 119 |
|
| 120 |
|
| 121 |
// ignore all X errors |
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
-- |
| 126 |
gentoo-commits@l.g.o mailing list |
Archives