r2750 - in packages/trunk/wormux/debian: . patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-05-28 21:07:26 +0000 (Mon, 28 May 2007)
New Revision: 2750

Added:
   packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch
Removed:
   packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch
Modified:
   packages/trunk/wormux/debian/changelog
Log:
backport a part of the upstream changes to fix ftbfs on gcc 4.2 - stupid me, I should have looked in upstream svn first

Modified: packages/trunk/wormux/debian/changelog
===================================================================
--- packages/trunk/wormux/debian/changelog	2007-05-28 18:24:25 UTC (rev 2749)
+++ packages/trunk/wormux/debian/changelog	2007-05-28 21:07:26 UTC (rev 2750)
@@ -1,6 +1,6 @@
 wormux (0.7.9-4) unstable; urgency=low
 
-  * fix FTBFS with GCC 4.2: empty body in an else-statement
+  * backported upstream changes wrt failure to build with GCC 4.2
     (Closes: #424582)
 
  -- Eddy Petrișor <eddy.petrisor at gmail.com>  Mon, 28 May 2007 16:56:25 +0300

Deleted: packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch
===================================================================
--- packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch	2007-05-28 18:24:25 UTC (rev 2749)
+++ packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch	2007-05-28 21:07:26 UTC (rev 2750)
@@ -1,46 +0,0 @@
---- a/src/character/body.cpp.original	2007-05-28 14:54:41.000000000 +0300
-+++ b/src/character/body.cpp	2007-05-28 14:56:26.000000000 +0300
-@@ -437,7 +437,10 @@
-     need_rebuild = true;
-   }
-   else
-+  {
-     MSG_DEBUG("body","Clothe not found");
-+    ;
-+  }
- 
- 
-   play_once_clothe_sauv = NULL;
-@@ -462,7 +465,10 @@
-     need_rebuild = true;
-   }
-   else
-+  {
-     MSG_DEBUG("body","Movement not found");
-+    ;
-+  }
- 
-   play_once_mvt_sauv = NULL;
- 
-@@ -492,7 +498,10 @@
-     need_rebuild = true;
-   }
-   else
-+  {
-     MSG_DEBUG("body","Clothe not found");
-+    ;
-+  }
- 
-   assert(current_clothe != NULL);
- }
-@@ -520,7 +529,10 @@
-     need_rebuild = true;
-   }
-   else
-+  {
-     MSG_DEBUG("body","Movement not found");
-+    ;
-+  }
- 
-   assert(current_mvt != NULL);
- }

Copied: packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch (from rev 2749, packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch)
===================================================================
--- packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch	                        (rev 0)
+++ packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch	2007-05-28 21:07:26 UTC (rev 2750)
@@ -0,0 +1,60 @@
+diff -Nur wormux-0.7.9/src/menu/credits_menu.cpp wormux-0.7.9.new/src/menu/credits_menu.cpp
+--- wormux-0.7.9/src/menu/credits_menu.cpp	2007-01-28 14:03:47.000000000 +0000
++++ wormux-0.7.9.new/src/menu/credits_menu.cpp	2007-05-28 20:49:07.000000000 +0000
+@@ -111,7 +111,7 @@
+     return;
+   }
+   // Use an array for this is the best solution I think, but there is perhaps a better code...
+-  static char *teams[] = { "team", "contributors", "thanks" };
++  static std::string teams[] = { "team", "contributors", "thanks" };
+ 
+   for(uint i = 0; i < (sizeof teams / sizeof* teams); ++i)
+   {
+diff -Nur wormux-0.7.9/src/menu/menu.cpp wormux-0.7.9.new/src/menu/menu.cpp
+--- wormux-0.7.9/src/menu/menu.cpp	2007-05-28 20:46:11.000000000 +0000
++++ wormux-0.7.9.new/src/menu/menu.cpp	2007-05-28 20:46:13.000000000 +0000
+@@ -26,7 +26,7 @@
+ #include "../tool/resource_manager.h"
+ #include "../sound/jukebox.h"
+ 
+-Menu::Menu(char * bg, t_action _actions) :
++Menu::Menu(std::string bg, t_action _actions) :
+   actions(_actions)
+ {
+   close_menu = false ;
+diff -Nur wormux-0.7.9/src/menu/menu.h wormux-0.7.9.new/src/menu/menu.h
+--- wormux-0.7.9/src/menu/menu.h	2007-05-28 20:46:11.000000000 +0000
++++ wormux-0.7.9.new/src/menu/menu.h	2007-05-28 20:46:13.000000000 +0000
+@@ -52,7 +52,7 @@
+    WidgetList widgets;
+    const t_action actions;
+ 
+-   Menu(char* bg, t_action actions = vOkCancel); 
++   Menu(std::string bg, t_action actions = vOkCancel);
+    virtual ~Menu();
+ 
+    void Run ();
+diff -Nur wormux-0.7.9/src/tool/debug.h wormux-0.7.9.new/src/tool/debug.h
+--- wormux-0.7.9/src/tool/debug.h	2007-05-28 20:46:11.000000000 +0000
++++ wormux-0.7.9.new/src/tool/debug.h	2007-05-28 20:46:13.000000000 +0000
+@@ -35,7 +35,7 @@
+ #  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...) \
+ 	PrintDebug( __FILE__, __PRETTY_FUNCTION__, __LINE__, LEVEL, MESSAGE, ## ARGS);
+ #else
+-#  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...)
++#  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...) do {} while (0)
+ #endif
+ 
+ void PrintDebug (const char *filename, const char *function, unsigned long line,
+diff -Nur wormux-0.7.9/src/tool/resource_manager.cpp wormux-0.7.9.new/src/tool/resource_manager.cpp
+--- wormux-0.7.9/src/tool/resource_manager.cpp	2007-05-28 20:46:11.000000000 +0000
++++ wormux-0.7.9.new/src/tool/resource_manager.cpp	2007-05-28 20:46:13.000000000 +0000
+@@ -64,7 +64,7 @@
+     Error("ResourceManager: can't find color resource \""+resource_name+"\" in profile "+profile->filename);
+ 
+   uint chanel_color[4];
+-  char * tmp[4] = { "r", "g", "b", "a" };
++  std::string tmp[4] = { "r", "g", "b", "a" };
+   for(int i = 0; i < 4; i++) {
+     if (!profile->doc->ReadUintAttr( elem, tmp[i], chanel_color[i]))
+       Error("ResourceManager: color resource \""+resource_name+"\" has no "+tmp[i]+" field in profile "+profile->filename);