diff options
| author | dsomero <xgizzmo@slackbuilds.org> | 2011-03-27 19:55:58 -0400 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-03-27 22:03:14 -0500 |
| commit | 52d0a64056a266ac9924fbd49c27f3a959464ca6 (patch) | |
| tree | cbd961c9c46f4a89c2136e65283c9c39460c0c64 | |
| parent | cdbd4988495b977e56569a4662d14697d4c819a8 (diff) | |
games/widelands: Patched to build with gcc4.5.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | games/widelands/widelands-0.15-gcc45.patch | 49 | ||||
| -rw-r--r-- | games/widelands/widelands.SlackBuild | 4 |
2 files changed, 52 insertions, 1 deletions
diff --git a/games/widelands/widelands-0.15-gcc45.patch b/games/widelands/widelands-0.15-gcc45.patch new file mode 100644 index 0000000000000..efd42a8b95e4f --- /dev/null +++ b/games/widelands/widelands-0.15-gcc45.patch @@ -0,0 +1,49 @@ +--- src/editor/ui_menus/editor_main_menu_random_map.cc.old 2010-05-18 17:17:15.000000000 +0200 ++++ src/editor/ui_menus/editor_main_menu_random_map.cc 2010-05-18 17:18:29.000000000 +0200 +@@ -251,7 +251,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -322,7 +322,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + +--- src/editor/ui_menus/editor_main_menu_new_map.cc.old 2010-05-18 17:38:29.000000000 +0200 ++++ src/editor/ui_menus/editor_main_menu_new_map.cc 2010-05-18 17:38:55.000000000 +0200 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild index 5c723a914ea6f..9b8e2b187f7cd 100644 --- a/games/widelands/widelands.SlackBuild +++ b/games/widelands/widelands.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=widelands VERSION=build15 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -65,6 +65,8 @@ cd $PRGNAM-$VERSION-src chown -R root:root . chmod -R u+w,go+r-w,a-s . +patch -p0 < $CWD/widelands-0.15-gcc45.patch + # make locale install dir configurable localedir="WLBUILD_INSTALL_LOCALEDIR" old="$localedir \"\${CMAKE_INSTALL_PREFIX}/\${WL_INSTALL_DATADIR}/locale\"" |