Patch for annoying crash when clicking 'Reject Trade' twice

5 files changed, 81 insertions, 3 deletions

diff --git a/games-board/gnocatan/ChangeLog b/games-board/gnocatan/ChangeLog
index 23fd231e6259..30b403b4606a 100644
--- a/games-board/gnocatan/ChangeLog
+++ b/games-board/gnocatan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/gnocatan
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/ChangeLog,v 1.13 2004/08/10 03:39:10 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/ChangeLog,v 1.14 2004/08/23 21:49:38 rizzo Exp $
+
+*gnocatan-0.8.1.30-r1 (23 Aug 2004)
+
+  23 Aug 2004; Don Seiler <rizzo@gentoo.org>
+  +files/gnocatan-reject_trade_2x.patch, +gnocatan-0.8.1.30-r1.ebuild:
+  Patch for annoying crash when clicking 'Reject Trade' twice
 
   09 Aug 2004; Don Seiler <rizzo@gentoo.org> gnocatan-0.8.1.30.ebuild:
   Stable on x86
diff --git a/games-board/gnocatan/Manifest b/games-board/gnocatan/Manifest
index 7277c1a664f3..38a0118db9d0 100644
--- a/games-board/gnocatan/Manifest
+++ b/games-board/gnocatan/Manifest
@@ -1,4 +1,7 @@
-MD5 f640e87f4d60c3c1143fdeeed7db0033 ChangeLog 2667
-MD5 630c3f699228283a0fe59eb38cb0e99d gnocatan-0.8.1.30.ebuild 719
+MD5 364dbea926d6cdf69bdb3f6071abf0d9 ChangeLog 2883
+MD5 b9ff234aef9af9a0dfef999d376ab783 gnocatan-0.8.1.30-r1.ebuild 812
 MD5 cfd29f58e6f9fb057c83c8eb26c1a101 metadata.xml 315
+MD5 630c3f699228283a0fe59eb38cb0e99d gnocatan-0.8.1.30.ebuild 719
+MD5 a51a7e0c0ecddac2e0d42170a92b8ace files/digest-gnocatan-0.8.1.30-r1 70
+MD5 7dc28c417433d5af5ced8694d4b7c4a9 files/gnocatan-reject_trade_2x.patch 1058
 MD5 a51a7e0c0ecddac2e0d42170a92b8ace files/digest-gnocatan-0.8.1.30 70
diff --git a/games-board/gnocatan/files/digest-gnocatan-0.8.1.30-r1 b/games-board/gnocatan/files/digest-gnocatan-0.8.1.30-r1
new file mode 100644
index 000000000000..5fb62f0184bb
--- /dev/null
+++ b/games-board/gnocatan/files/digest-gnocatan-0.8.1.30-r1
@@ -0,0 +1 @@
+MD5 3ea69eb647eea4173979293d24d81f54 gnocatan-0.8.1.30.tar.gz 2053826
diff --git a/games-board/gnocatan/files/gnocatan-reject_trade_2x.patch b/games-board/gnocatan/files/gnocatan-reject_trade_2x.patch
new file mode 100644
index 000000000000..dfdf3696b405
--- /dev/null
+++ b/games-board/gnocatan/files/gnocatan-reject_trade_2x.patch
@@ -0,0 +1,35 @@
+===================================================================
+RCS file: /cvsroot/gnocatan/gnocatan/client/gtk/interface.c,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- gnocatan/gnocatan/client/gtk/interface.c	2004/07/24 12:47:39	1.9
++++ gnocatan/gnocatan/client/gtk/interface.c	2004/08/01 09:33:15	1.10
+@@ -24,6 +24,8 @@
+ #include "cost.h"
+ #include "histogram.h"
+ 
++static gboolean already_rejected = FALSE; /** @todo UGLY HACK, remove later */
++
+ /* local functions */
+ static void frontend_state_turn (GuiEvent event);
+ 
+@@ -178,7 +180,9 @@
+ 		cb_delete_quote (quote_current_quote ()->var.d.quote_num);
+ 		return;
+ 	case GUI_QUOTE_REJECT:
+-		cb_end_quote ();
++		if (!already_rejected)
++			cb_end_quote ();
++		already_rejected = TRUE;
+ 		return;
+ 	default:
+ 		break;
+@@ -187,6 +191,7 @@
+ 
+ void frontend_quote (gint player_num, gint *they_supply, gint *they_receive)
+ {
++	already_rejected = FALSE;
+ 	if (get_gui_state () == frontend_state_quote) {
+ 		quote_begin_again(player_num, they_supply, they_receive);
+ 	} else {
diff --git a/games-board/gnocatan/gnocatan-0.8.1.30-r1.ebuild b/games-board/gnocatan/gnocatan-0.8.1.30-r1.ebuild
new file mode 100644
index 000000000000..6683c07f809b
--- /dev/null
+++ b/games-board/gnocatan/gnocatan-0.8.1.30-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/gnocatan-0.8.1.30-r1.ebuild,v 1.1 2004/08/23 21:49:38 rizzo Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A clone of the popular board game The Settlers of Catan"
+HOMEPAGE="http://gnocatan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnocatan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE="nls"
+
+RDEPEND=">=gnome-base/libgnomeui-2.2*
+	=dev-libs/glib-1.2*
+	>=app-text/scrollkeeper-0.3*"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gnocatan-reject_trade_2x.patch
+}
+src_compile() {
+	export G2CONF="${G2CONF} `use_enable nls`"
+	gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog README"
+	gnome2_src_install
+}