- obsoleted

Changed files:
    widelands-gcc-4.5.patch -> 1.2
    widelands-locale.patch -> 1.2

diff --git a/widelands-gcc-4.5.patch b/widelands-gcc-4.5.patch
deleted file mode 100644 (file)
index 0f9a54c..0000000
--- a/widelands-gcc-4.5.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- widelands-build15-src/src/editor/ui_menus/editor_main_menu_random_map.cc~  2010-04-16 17:41:22.000000000 +0200
-+++ widelands-build15-src/src/editor/ui_menus/editor_main_menu_random_map.cc   2010-04-26 14:49:08.138178091 +0200
-@@ -272,7 +272,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;
- 
-@@ -343,7 +343,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
- 
---- widelands-build15-src/src/editor/ui_menus/editor_main_menu_new_map.cc~     2010-04-16 17:41:22.000000000 +0200
-+++ widelands-build15-src/src/editor/ui_menus/editor_main_menu_new_map.cc      2010-04-26 15:17:52.691333135 +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/widelands-locale.patch b/widelands-locale.patch
deleted file mode 100644 (file)
index a79e895..0000000
--- a/widelands-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- widelands-build15-src/CMakeLists.txt       2010-04-16 15:41:22.000000000 +0000
-+++ widelands-build15-src/CMakeLists.txt       2010-04-17 14:43:42.000000000 +0000
-@@ -79,7 +79,7 @@
- 
- set (WLBUILD_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- set (WLBUILD_INSTALL_DATADIR ${WL_INSTALL_DATADIR})
--set (WLBUILD_INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${WL_INSTALL_DATADIR}/locale")
-+set (WLBUILD_INSTALL_LOCALEDIR ${WL_INSTALL_LOCALEDIR})
- set (WLBUILD_INSTALL_BINDIR ${WL_INSTALL_BINDIR})
- 
- if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)