diff --git a/fix-return-values.diff b/fix-return-values.diff new file mode 100644 index 0000000..b370c02 --- /dev/null +++ b/fix-return-values.diff @@ -0,0 +1,20 @@ +--- src/logic/expedition_bootstrap.cc.orig 2014-02-25 18:23:49.184906307 +0100 ++++ src/logic/expedition_bootstrap.cc 2014-02-25 18:24:11.959906892 +0100 +@@ -180,6 +180,7 @@ + } + } + assert(false); // Never here, otherwise we do not have a queue for this ware. ++ return NULL; + } + + std::vector ExpeditionBootstrap::wares() const { +--- src/scripting/lua_map.cc.orig 2014-02-25 18:24:39.048907588 +0100 ++++ src/scripting/lua_map.cc 2014-02-25 18:24:51.019907895 +0100 +@@ -82,6 +82,7 @@ + return CAST_TO_LUA(Ship); + } + assert(false); // Never here, hopefully. ++ return 0; + } + int upcasted_immovable_to_lua(lua_State * L, BaseImmovable * mo) { + if (!mo) diff --git a/widelands.spec b/widelands.spec index 8e4cc94..5b924ae 100644 --- a/widelands.spec +++ b/widelands.spec @@ -27,6 +27,7 @@ Group: Amusements/Games/Strategy/Other Url: http://www.widelands.org Source0: %{name}-%{version}-src.tar.bz2 Source1: %{name}.desktop +Patch1: fix-return-values.diff BuildRequires: SDL_gfx-devel BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel @@ -78,6 +79,7 @@ Data files for Widelands. Including localization, maps graphics and music. %prep %setup -q -n %{name}-%{version}-src +%patch1 %if %build_launchpad # for launchpad translation update cd ..