OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

153 lines
6.6 KiB

  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../pingus/gcc4.patch
  5. # Copyright (C) 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. diff -Nur pingus-0.6.0-orig/src/blitter.cxx pingus-0.6.0/src/blitter.cxx
  17. --- pingus-0.6.0-orig/src/blitter.cxx 2003-04-09 20:22:59.000000000 +0000
  18. +++ pingus-0.6.0/src/blitter.cxx 2006-01-25 23:01:12.081946750 +0000
  19. @@ -17,6 +17,7 @@
  20. // along with this program; if not, write to the Free Software
  21. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  22. +#include <assert.h>
  23. #include <config.h>
  24. #include <stdio.h>
  25. #include "pingus_error.hxx"
  26. diff -Nur pingus-0.6.0-orig/src/col_map.cxx pingus-0.6.0/src/col_map.cxx
  27. --- pingus-0.6.0-orig/src/col_map.cxx 2003-02-19 09:50:35.000000000 +0000
  28. +++ pingus-0.6.0/src/col_map.cxx 2006-01-25 23:01:39.979690250 +0000
  29. @@ -17,6 +17,7 @@
  30. // along with this program; if not, write to the Free Software
  31. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  32. +#include <assert.h>
  33. #include <iostream>
  34. #include <ClanLib/Display/SurfaceProviders/canvas.h>
  35. #include "gui/graphic_context.hxx"
  36. diff -Nur pingus-0.6.0-orig/src/console.cxx pingus-0.6.0/src/console.cxx
  37. --- pingus-0.6.0-orig/src/console.cxx 2003-01-02 20:49:55.000000000 +0000
  38. +++ pingus-0.6.0/src/console.cxx 2006-01-25 23:02:05.289272000 +0000
  39. @@ -17,6 +17,7 @@
  40. // along with this program; if not, write to the Free Software
  41. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  42. +#include <assert.h>
  43. #include <config.h>
  44. #include <ClanLib/Display/Display/display.h>
  45. #include <ClanLib/Display/Font/font.h>
  46. diff -Nur pingus-0.6.0-orig/src/demo_recorder.cxx pingus-0.6.0/src/demo_recorder.cxx
  47. --- pingus-0.6.0-orig/src/demo_recorder.cxx 2003-04-04 11:23:27.000000000 +0000
  48. +++ pingus-0.6.0/src/demo_recorder.cxx 2006-01-25 23:02:29.986815500 +0000
  49. @@ -17,6 +17,7 @@
  50. // along with this program; if not, write to the Free Software
  51. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  52. +#include <assert.h>
  53. #include <time.h>
  54. #include <iostream>
  55. #include "system.hxx"
  56. diff -Nur pingus-0.6.0-orig/src/editor/generic_property_frame.cxx pingus-0.6.0/src/editor/generic_property_frame.cxx
  57. --- pingus-0.6.0-orig/src/editor/generic_property_frame.cxx 2003-03-25 23:15:23.000000000 +0000
  58. +++ pingus-0.6.0/src/editor/generic_property_frame.cxx 2006-01-25 23:03:08.805241500 +0000
  59. @@ -17,6 +17,7 @@
  60. // along with this program; if not, write to the Free Software
  61. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  62. +#include <assert.h>
  63. #include <iostream>
  64. #include <ClanLib/GUI/label.h>
  65. #include <ClanLib/GUI/inputbox.h>
  66. diff -Nur pingus-0.6.0-orig/src/gui/root_gui_manager.cxx pingus-0.6.0/src/gui/root_gui_manager.cxx
  67. --- pingus-0.6.0-orig/src/gui/root_gui_manager.cxx 2002-09-25 10:16:17.000000000 +0000
  68. +++ pingus-0.6.0/src/gui/root_gui_manager.cxx 2006-01-25 23:03:31.422655000 +0000
  69. @@ -17,6 +17,7 @@
  70. // along with this program; if not, write to the Free Software
  71. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  72. +#include <assert.h>
  73. #include "root_gui_manager.hxx"
  74. #include "../input/controller.hxx"
  75. diff -Nur pingus-0.6.0-orig/src/pingu_holder.cxx pingus-0.6.0/src/pingu_holder.cxx
  76. --- pingus-0.6.0-orig/src/pingu_holder.cxx 2003-03-25 00:37:44.000000000 +0000
  77. +++ pingus-0.6.0/src/pingu_holder.cxx 2006-01-25 23:04:21.497784500 +0000
  78. @@ -17,6 +17,7 @@
  79. // along with this program; if not, write to the Free Software
  80. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  81. +#include <assert.h>
  82. #include <iostream>
  83. #include "pingu_holder.hxx"
  84. #include "pingu.hxx"
  85. diff -Nur pingus-0.6.0-orig/src/savegame_manager.cxx pingus-0.6.0/src/savegame_manager.cxx
  86. --- pingus-0.6.0-orig/src/savegame_manager.cxx 2003-04-11 12:45:39.000000000 +0000
  87. +++ pingus-0.6.0/src/savegame_manager.cxx 2006-01-25 23:04:42.583102250 +0000
  88. @@ -17,6 +17,7 @@
  89. // along with this program; if not, write to the Free Software
  90. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  91. +#include <assert.h>
  92. #include <iostream>
  93. #include <fstream>
  94. #include "system.hxx"
  95. diff -Nur pingus-0.6.0-orig/src/story_screen.cxx pingus-0.6.0/src/story_screen.cxx
  96. --- pingus-0.6.0-orig/src/story_screen.cxx 2003-04-15 23:12:29.000000000 +0000
  97. +++ pingus-0.6.0/src/story_screen.cxx 2006-01-25 23:00:49.428531000 +0000
  98. @@ -142,7 +142,7 @@
  99. if (!page_displayed_completly)
  100. {
  101. - unsigned int len = static_cast<unsigned int>(20.0f * time_passed);
  102. + size_t len = static_cast<unsigned int>(20.0f * time_passed);
  103. display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len));
  104. if (current_page.text.length() < len)
  105. diff -Nur pingus-0.6.0-orig/src/worldmap/dot.cxx pingus-0.6.0/src/worldmap/dot.cxx
  106. --- pingus-0.6.0-orig/src/worldmap/dot.cxx 2003-02-18 11:28:41.000000000 +0000
  107. +++ pingus-0.6.0/src/worldmap/dot.cxx 2006-01-25 23:05:04.748487500 +0000
  108. @@ -17,6 +17,7 @@
  109. // along with this program; if not, write to the Free Software
  110. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  111. +#include <assert.h>
  112. #include <iostream>
  113. #include "../xml_file_reader.hxx"
  114. #include "dot.hxx"
  115. diff -Nur pingus-0.6.0-orig/src/worldmap/graph.hxx pingus-0.6.0/src/worldmap/graph.hxx
  116. --- pingus-0.6.0-orig/src/worldmap/graph.hxx 2002-10-22 00:20:42.000000000 +0000
  117. +++ pingus-0.6.0/src/worldmap/graph.hxx 2006-01-25 23:06:27.597665250 +0000
  118. @@ -20,8 +20,10 @@
  119. #ifndef HEADER_GRAPH_HXX
  120. #define HEADER_GRAPH_HXX
  121. +#include <assert.h>
  122. #include <algorithm>
  123. #include <vector>
  124. +#include <iostream.h>
  125. namespace WorldMapNS {
  126. diff -Nur pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx pingus-0.6.0/src/worldmap/sprite_drawable.hxx
  127. --- pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx 2003-04-10 11:51:32.000000000 +0000
  128. +++ pingus-0.6.0/src/worldmap/sprite_drawable.hxx 2006-01-25 23:07:06.552099750 +0000
  129. @@ -46,7 +46,7 @@
  130. private:
  131. SpriteDrawable (const SpriteDrawable&);
  132. - SpriteDrawable operator= (const SpriteDrawable&);
  133. + SpriteDrawable& operator= (const SpriteDrawable&);
  134. };
  135. } // namespace WorldMapNS