blackbox-0.70.1-gcc43.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106
  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. #include <assert.h>
  6. #include <math.h>
  7. -#include <stdio.h>
  8. -#include <stdlib.h>
  9. +#include <cstdio>
  10. +#include <cstdlib>
  11. +#include <cstring>
  12. // #define COLORTABLE_DEBUG
  13. // #define MITSHM_DEBUG
  14. diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
  15. --- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200
  16. +++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100
  17. @@ -28,7 +28,8 @@
  18. #include <X11/Xlib.h>
  19. #include <X11/Xresource.h>
  20. -#include <stdio.h>
  21. +#include <cstdio>
  22. +#include <cstring>
  23. bt::Resource::Resource(void)
  24. diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
  25. --- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200
  26. +++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100
  27. @@ -25,7 +25,8 @@
  28. #include "Util.hh"
  29. #include "XDG.hh"
  30. -#include <stdlib.h>
  31. +#include <cstdlib>
  32. +#include <algorithm>
  33. // make sure directory names end with a slash
  34. diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
  35. --- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200
  36. +++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100
  37. @@ -33,6 +33,8 @@
  38. #include <X11/Xutil.h>
  39. #include <X11/cursorfont.h>
  40. +#include <cstring>
  41. +
  42. BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
  43. screen_resources = 0;
  44. diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
  45. --- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100
  46. +++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100
  47. @@ -34,7 +34,8 @@
  48. #include "blackbox.hh"
  49. #include "../version.h"
  50. -#include <stdio.h>
  51. +#include <cstdio>
  52. +#include <cstring>
  53. static void showHelp(int exitval) {
  54. diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
  55. --- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200
  56. +++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100
  57. @@ -45,8 +45,9 @@
  58. #include <sys/types.h>
  59. #include <sys/stat.h>
  60. #include <assert.h>
  61. -#include <ctype.h>
  62. #include <dirent.h>
  63. +#include <cctype>
  64. +#include <cstring>
  65. static bool running = true;
  66. diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
  67. --- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200
  68. +++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100
  69. @@ -33,6 +33,8 @@
  70. #include <assert.h>
  71. +#include <cstring>
  72. +
  73. static const int iconify_width = 9;
  74. static const int iconify_height = 9;
  75. diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
  76. --- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100
  77. +++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100
  78. @@ -30,7 +30,9 @@
  79. #include <cctype>
  80. #include <X11/Xatom.h>
  81. -#include <stdio.h>
  82. +#include <cstdio>
  83. +#include <cstdlib>
  84. +#include <cstring>
  85. // ignore all X errors