add the rest of the patch to fix bug #198807 and rev bump to force it out

(Portage version: 2.1.3.19)

4 files changed, 70 insertions, 2 deletions

diff --git a/games-board/pioneers/ChangeLog b/games-board/pioneers/ChangeLog
index 54bbbe9002a2..3a931d511ddd 100644
--- a/games-board/pioneers/ChangeLog
+++ b/games-board/pioneers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/pioneers
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.14 2007/11/11 14:42:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.15 2007/11/20 03:09:06 mr_bones_ Exp $
+
+*pioneers-0.11.3-r1 (20 Nov 2007)
+
+  20 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/pioneers-0.11.3-DOS.patch, -pioneers-0.11.3.ebuild,
+  +pioneers-0.11.3-r1.ebuild:
+  add the rest of the patch to fix bug #198807 and rev bump to force it out
 
   11 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
   -pioneers-0.9.33.ebuild, -pioneers-0.10.2.ebuild, pioneers-0.11.3.ebuild:
diff --git a/games-board/pioneers/files/digest-pioneers-0.11.3 b/games-board/pioneers/files/digest-pioneers-0.11.3-r1
index 30a00aaaa642..30a00aaaa642 100644
--- a/games-board/pioneers/files/digest-pioneers-0.11.3
+++ b/games-board/pioneers/files/digest-pioneers-0.11.3-r1
diff --git a/games-board/pioneers/files/pioneers-0.11.3-DOS.patch b/games-board/pioneers/files/pioneers-0.11.3-DOS.patch
new file mode 100644
index 000000000000..d7241eddb501
--- /dev/null
+++ b/games-board/pioneers/files/pioneers-0.11.3-DOS.patch
@@ -0,0 +1,56 @@
+Index: common/state.c
+===================================================================
+--- common/state.c	(revision 1355)
++++ common/state.c	(working copy)
+@@ -68,10 +68,12 @@
+ 
+ static void route_event(StateMachine * sm, gint event)
+ {
+-	StateFunc curr_state;
++	StateFunc curr_state = NULL;
+ 	gpointer user_data;
+ 
+-	curr_state = sm_current(sm);
++	if (sm->stack_ptr >= 0)
++		curr_state = sm_current(sm);
++
+ 	user_data = sm->user_data;
+ 	if (user_data == NULL)
+ 		user_data = sm;
+@@ -89,20 +91,22 @@
+ 
+ 	switch (event) {
+ 	case SM_ENTER:
+-		curr_state(user_data, event);
++		if (curr_state)
++			curr_state(user_data, event);
+ 		break;
+ 	case SM_INIT:
+-		curr_state(user_data, event);
++		if (curr_state)
++			curr_state(user_data, event);
+ 		if (!sm->is_dead && sm->global !=NULL)
+ 			sm->global (user_data, event);
+ 		break;
+ 	case SM_RECV:
+ 		sm_cancel_prefix(sm);
+-		if (curr_state(user_data, event))
++		if (curr_state && curr_state(user_data, event))
+ 			break;
+ 		sm_cancel_prefix(sm);
+ 		if (!sm->is_dead
+-		    && sm->global !=NULL && sm->global (user_data, event))
++		    && sm->global != NULL && sm->global (user_data, event))
+ 			break;
+ 
+ 		sm_cancel_prefix(sm);
+@@ -112,7 +116,8 @@
+ 	case SM_NET_CLOSE:
+ 		sm_close(sm);
+ 	default:
+-		curr_state(user_data, event);
++		if (curr_state)
++			curr_state(user_data, event);
+ 		if (!sm->is_dead && sm->global !=NULL)
+ 			sm->global (user_data, event);
+ 		break;
diff --git a/games-board/pioneers/pioneers-0.11.3.ebuild b/games-board/pioneers/pioneers-0.11.3-r1.ebuild
index 76915b258114..fd2ac1790085 100644
--- a/games-board/pioneers/pioneers-0.11.3.ebuild
+++ b/games-board/pioneers/pioneers-0.11.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-0.11.3.ebuild,v 1.3 2007/11/11 15:12:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-0.11.3-r1.ebuild,v 1.1 2007/11/20 03:09:06 mr_bones_ Exp $
 
 inherit eutils gnome2
 
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-DOS.patch" #bug #198807
+}
+
 src_compile() {
 	gnome2_src_compile $(use_enable nls)
 }