rpm/widelands
SHA256
1
0
Fork 0
forked from pool/widelands
Code Pull Requests Activity

add patch for return-non-void

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2009-05-01 20:45:41 +00:00 committed by Git OBS Bridge
parent 5039cd0174
commit c2d41a4d8f
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
widelands-b13-return-non-void.diff Normal file
View File

@ -0,0 +1,33 @@
diff -ur widelands-b13/src/events/event_factory.cc widelands-b13.patched//src/events/event_factory.cc
--- widelands-b13/src/events/event_factory.cc 2008-09-22 22:46:52.000000000 +0200
+++ widelands-b13.patched//src/events/event_factory.cc 2009-05-01 22:41:10.000000000 +0200
@@ -131,6 +131,7 @@
case 12: return *new Event_Unhide_Area (name, state);
default:
assert(false);
+ return *new Event_Allow_Building (name, state);
}
}
diff -ur widelands-b13/src/map.h widelands-b13.patched//src/map.h
--- widelands-b13/src/map.h 2008-10-10 22:53:46.000000000 +0200
+++ widelands-b13.patched//src/map.h 2009-05-01 22:40:39.000000000 +0200
@@ -1038,6 +1038,7 @@
case Map_Object::WALK_W: return l_n(f);
default:
assert(false);
+ case Map_Object::WALK_NW: return tl_n(f);
}
}
diff -ur widelands-b13/src/trigger/trigger_factory.cc widelands-b13.patched//src/trigger/trigger_factory.cc
--- widelands-b13/src/trigger/trigger_factory.cc 2008-09-22 22:46:52.000000000 +0200
+++ widelands-b13.patched//src/trigger/trigger_factory.cc 2009-05-01 22:40:23.000000000 +0200
@@ -93,6 +93,7 @@
case 5: return *new Trigger_Vision (name, set);
default:
assert(false);
+ return *new Trigger_Building (name, set);
}
}

3
widelands.spec
View File

@ -13,6 +13,7 @@ URL: http://www.widelands.org
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
Source1: widelands.desktop
Patch0: widelands.flagfix.patch
Patch1: widelands-b13-return-non-void.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel
@ -35,9 +36,11 @@ perhaps will have a thought, what Widelands is all about.
%prep
%setup -q -n %{name}-b13
# %patch0 -p0
%patch1 -p1
sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
%build
export CCFLAGS="$optflags"
scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
# ./build-widelands.sh