diff options
author | Don Seiler <rizzo@gentoo.org> | 2004-08-10 03:41:03 +0000 |
---|---|---|
committer | Don Seiler <rizzo@gentoo.org> | 2004-08-10 03:41:03 +0000 |
commit | af2ed56a04a9898695bdd783fc717b3595c765d5 (patch) | |
tree | 838579dd8cb56b799c5235e0e7e0b745a1214cc9 /games-board | |
parent | Stable on x86 (diff) | |
download | historical-af2ed56a04a9898695bdd783fc717b3595c765d5.tar.gz historical-af2ed56a04a9898695bdd783fc717b3595c765d5.tar.bz2 historical-af2ed56a04a9898695bdd783fc717b3595c765d5.zip |
Removing obsolete files
Diffstat (limited to 'games-board')
-rw-r--r-- | games-board/gnocatan/Manifest | 6 | ||||
-rw-r--r-- | games-board/gnocatan/files/chat.diff | 51 | ||||
-rw-r--r-- | games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1 | 1 | ||||
-rw-r--r-- | games-board/gnocatan/files/gmap.diff | 16 | ||||
-rw-r--r-- | games-board/gnocatan/files/nothing.diff | 28 | ||||
-rw-r--r-- | games-board/gnocatan/files/servertrade.diff | 104 | ||||
-rw-r--r-- | games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild | 45 |
7 files changed, 0 insertions, 251 deletions
diff --git a/games-board/gnocatan/Manifest b/games-board/gnocatan/Manifest index 89e191063ee2..7277c1a664f3 100644 --- a/games-board/gnocatan/Manifest +++ b/games-board/gnocatan/Manifest @@ -1,10 +1,4 @@ MD5 f640e87f4d60c3c1143fdeeed7db0033 ChangeLog 2667 -MD5 c3b2b997ea39e56d096c2a4d5a935ad7 gnocatan-0.8.1.16-r1.ebuild 1090 MD5 630c3f699228283a0fe59eb38cb0e99d gnocatan-0.8.1.30.ebuild 719 MD5 cfd29f58e6f9fb057c83c8eb26c1a101 metadata.xml 315 -MD5 9022b7d722de7336e084c4a2e2f18763 files/chat.diff 1593 -MD5 f7edf2ac07200fa2cb176fd70558df99 files/digest-gnocatan-0.8.1.16-r1 70 MD5 a51a7e0c0ecddac2e0d42170a92b8ace files/digest-gnocatan-0.8.1.30 70 -MD5 ab1f6d93d8b17253b7502d64ebc82b7a files/gmap.diff 601 -MD5 0686adfa1730f7893ce20ff622b8b1d5 files/nothing.diff 816 -MD5 ee4bbf184acc8f36bb9af8c6901f546c files/servertrade.diff 3131 diff --git a/games-board/gnocatan/files/chat.diff b/games-board/gnocatan/files/chat.diff deleted file mode 100644 index 93d67ba4ab12..000000000000 --- a/games-board/gnocatan/files/chat.diff +++ /dev/null @@ -1,51 +0,0 @@ -Index: chat.c -=================================================================== -RCS file: /cvsroot/gnocatan/gnocatan/client/gtk/chat.c,v -retrieving revision 1.2 -diff -u -p -r1.2 chat.c ---- chat.c 1 Jan 2004 19:23:09 -0000 1.2 -+++ chat.c 23 Feb 2004 23:04:29 -0000 -@@ -19,15 +19,16 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#define GDK_DISABLE_DEPRECATED 1 -+#define GTK_DISABLE_DEPRECATED 1 -+#define GNOME_DISABLE_DEPRECATED 1 -+ - #include "config.h" --#include <string.h> -- --#include "log.h" - #include "frontend.h" - --#define MAX_CHAT 512 /* maximum chat message size */ -+#define MAX_CHAT 512 /* maximum chat message size */ - --static GtkWidget *chat_entry; /* messages text widget */ -+static GtkWidget *chat_entry; /* messages text widget */ - - static void chat_cb(GtkEditable *editable, UNUSED(gpointer user_data)) - { -@@ -59,8 +60,9 @@ GtkWidget *chat_build_panel() - gtk_widget_show(frame); - - chat_entry = gtk_entry_new(); -- gtk_signal_connect(GTK_OBJECT(chat_entry), "activate", -- GTK_SIGNAL_FUNC(chat_cb), NULL); -+ gtk_entry_set_max_length(GTK_ENTRY(chat_entry), MAX_CHAT); -+ g_signal_connect(G_OBJECT(chat_entry), "activate", -+ G_CALLBACK(chat_cb), NULL); - gtk_widget_show(chat_entry); - gtk_container_add(GTK_CONTAINER(frame), chat_entry); - -@@ -69,5 +71,8 @@ GtkWidget *chat_build_panel() - - void chat_set_focus(void) - { -- gtk_widget_grab_focus(GTK_WIDGET(chat_entry)); -+ if (!gtk_widget_is_focus(chat_entry)) { -+ gtk_widget_grab_focus(chat_entry); -+ gtk_editable_set_position(GTK_EDITABLE(chat_entry), -1); -+ } - } diff --git a/games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1 b/games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1 deleted file mode 100644 index fe963935f0ef..000000000000 --- a/games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 9dd31aad77a44ed2e3e8ba6c39e5aa7e gnocatan-0.8.1.16.tar.gz 2116705 diff --git a/games-board/gnocatan/files/gmap.diff b/games-board/gnocatan/files/gmap.diff deleted file mode 100644 index 06cba4ceddcf..000000000000 --- a/games-board/gnocatan/files/gmap.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: client/gtk/gui.c -=================================================================== -RCS file: /cvsroot/gnocatan/gnocatan/client/gtk/gui.c,v -retrieving revision 1.4 -diff -u -p -r1.4 gui.c ---- client/gtk/gui.c 2 Jan 2004 13:33:50 -0000 1.4 -+++ client/gtk/gui.c 6 Feb 2004 18:25:41 -0000 -@@ -296,7 +296,7 @@ void gui_highlight_chits(gint roll) - static gint expose_map_cb(GtkWidget *area, GdkEventExpose *event, - UNUSED(gpointer user_data)) - { -- if (area->window == NULL || map == NULL) -+ if (area->window == NULL || map == NULL || gmap == NULL) - return FALSE; - - if (gmap->pixmap == NULL) { diff --git a/games-board/gnocatan/files/nothing.diff b/games-board/gnocatan/files/nothing.diff deleted file mode 100644 index d7986315bb14..000000000000 --- a/games-board/gnocatan/files/nothing.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: client/common/resource.c -=================================================================== -RCS file: /cvsroot/gnocatan/gnocatan/client/common/resource.c,v -retrieving revision 1.3 -diff -u -p -r1.3 resource.c ---- client/common/resource.c 11 Jan 2004 22:38:26 -0000 1.3 -+++ client/common/resource.c 8 Feb 2004 20:38:15 -0000 -@@ -134,7 +134,7 @@ void resource_format_num(gchar *str, gui - str[len - 1] = '\0'; - return; - } -- -+ - if (num_types == 1) { - for (idx = 0; idx < NO_RESOURCE; idx++) { - gint num = resources[idx]; -@@ -211,6 +211,11 @@ void resource_format_type(gchar *str, gi - if (resources[idx] != 0) - num_types++; - -+ if (num_types == 0) { -+ strcpy(str, _("nothing")); -+ return; -+ } -+ - if (num_types == 1) { - for (idx = 0; idx < NO_RESOURCE; idx++) { - gint num = resources[idx]; diff --git a/games-board/gnocatan/files/servertrade.diff b/games-board/gnocatan/files/servertrade.diff deleted file mode 100644 index 8d5af9534484..000000000000 --- a/games-board/gnocatan/files/servertrade.diff +++ /dev/null @@ -1,104 +0,0 @@ -Index: server/player.c -=================================================================== -RCS file: /cvsroot/gnocatan/gnocatan/server/player.c,v -retrieving revision 1.37 -diff -u -p -r1.37 player.c ---- server/player.c 1 Jan 2004 19:23:09 -0000 1.37 -+++ server/player.c 8 Feb 2004 00:43:53 -0000 -@@ -402,26 +402,11 @@ void player_archive(Player *player) - - /* If the player was in the middle of a trade, pop the state - machine and inform others as necessary */ -+ /* This doesn't quite solve anything, since it is still this -+ * player's turn, so the others have to wait for the reconnect -+ * anyway. */ - state = sm_current(player->sm); -- if (state == (StateFunc)mode_wait_quote_exit) -- { -- sm_pop(player->sm); -- } -- else if (state == (StateFunc)mode_domestic_quote) -- { -- for (;;) { -- QuoteInfo *quote; -- quote = quotelist_find_domestic(game->quotes, -- player->num, -1); -- if (quote == NULL) -- break; -- quotelist_delete(game->quotes, quote); -- } -- player_broadcast(player, PB_RESPOND, "domestic-quote finish\n"); -- -- sm_pop(player->sm); -- } -- else if (state == (StateFunc)mode_domestic_initiate) -+ if (state == (StateFunc)mode_domestic_initiate) - { - trade_finish_domestic(player); - } -Index: server/trade.c -=================================================================== -RCS file: /cvsroot/gnocatan/gnocatan/server/trade.c,v -retrieving revision 1.14 -diff -u -p -r1.14 trade.c ---- server/trade.c 1 Jan 2004 19:23:09 -0000 1.14 -+++ server/trade.c 8 Feb 2004 00:43:53 -0000 -@@ -125,6 +125,27 @@ gboolean mode_wait_quote_exit(Player *pl - return FALSE; - } - -+static void end_quote (Player *player) -+{ -+ /* Player has rejected domestic trade - remove all -+ * quotes from that player -+ */ -+ for (;;) { -+ QuoteInfo *quote; -+ quote = quotelist_find_domestic(player->game->quotes, -+ player->num, -1); -+ if (quote == NULL) -+ break; -+ quotelist_delete(player->game->quotes, quote); -+ } -+ player_broadcast(player, PB_RESPOND, "domestic-quote finish\n"); -+ -+ if (player->disconnected) -+ sm_pop (player->sm); -+ else -+ sm_goto(player->sm, (StateFunc)mode_wait_quote_exit); -+} -+ - gboolean mode_domestic_quote(Player *player, gint event) - { - StateMachine *sm = player->sm; -@@ -138,20 +159,7 @@ gboolean mode_domestic_quote(Player *pla - return FALSE; - - if (sm_recv(sm, "domestic-quote finish")) { -- /* Player has rejected domestic trade - remove all -- * quotes from that player -- */ -- for (;;) { -- QuoteInfo *quote; -- quote = quotelist_find_domestic(game->quotes, -- player->num, -1); -- if (quote == NULL) -- break; -- quotelist_delete(game->quotes, quote); -- } -- player_broadcast(player, PB_RESPOND, "domestic-quote finish\n"); -- -- sm_goto(sm, (StateFunc)mode_wait_quote_exit); -+ end_quote (player); - return TRUE; - } - -@@ -209,7 +217,7 @@ void trade_finish_domestic(Player *playe - list != NULL; list = player_next_real(list)) { - Player *scan = list->data; - if (scan != player && scan->num < game->params->num_players) -- sm_goto(scan->sm, (StateFunc)mode_wait_quote_exit); -+ end_quote (scan); - } - quotelist_free(game->quotes); - game->quotes = NULL; diff --git a/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild b/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild deleted file mode 100644 index c14944f2bfb1..000000000000 --- a/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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.16-r1.ebuild,v 1.5 2004/06/24 22:17:12 agriffis 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" -IUSE="nls" - -RDEPEND=">=gnome-base/libgnomeui-2.2* - =dev-libs/glib-1.2* - >=app-text/scrollkeeper-0.3*" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - cd ${S}/client/gtk - epatch ${FILESDIR}/chat.diff - epatch ${FILESDIR}/gmap.diff - sed -i \ - -e '/\(GDK\|GTK\|GNOME\)_DISABLE_DEPRECATED/d' chat.c histogram.c \ - || die "sed failed" - cd ${S}/client/common - epatch ${FILESDIR}/nothing.diff - cd ${S}/server - epatch ${FILESDIR}/servertrade.diff -} - -src_compile() { - export G2CONF="${G2CONF} `use_enable nls`" - gnome2_src_compile -} - -src_install() { - DOCS="AUTHORS ChangeLog README" - gnome2_src_install -} |