From c2d41a4d8f02dd3d80bc5c4e1678f789909773ee9988def98676f3f53dafda37 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 1 May 2009 20:45:41 +0000
Subject: [PATCH] add patch for return-non-void

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=11
---
 widelands-b13-return-non-void.diff | 33 ++++++++++++++++++++++++++++++
 widelands.spec                     |  3 +++
 2 files changed, 36 insertions(+)
 create mode 100644 widelands-b13-return-non-void.diff

diff --git a/widelands-b13-return-non-void.diff b/widelands-b13-return-non-void.diff
new file mode 100644
index 0000000..a2f9c6f
--- /dev/null
+++ b/widelands-b13-return-non-void.diff
@@ -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);
+ 	}
+ }
+ 
diff --git a/widelands.spec b/widelands.spec
index ded00af..5e99023 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -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