diff --git a/.gitignore b/.gitignore index b9222ec..bebb190 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ pioneers-0.12.3.tar.gz /pioneers-0.12.4.tar.gz +/pioneers-14.1.tar.gz diff --git a/pioneers-0.12.2-namechange.patch b/pioneers-0.12.2-namechange.patch deleted file mode 100644 index a1b30b0..0000000 --- a/pioneers-0.12.2-namechange.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr pioneers-0.12.2-orig/client/gtk/name.c pioneers-0.12.2/client/gtk/name.c ---- pioneers-0.12.2-orig/client/gtk/name.c 2008-05-01 15:05:57.000000000 -0400 -+++ pioneers-0.12.2/client/gtk/name.c 2010-08-01 17:29:58.284181851 -0400 -@@ -47,7 +47,7 @@ - gpointer user_data) - { - DialogData *dialog = user_data; -- if (response_id == GTK_RESPONSE_OK) { -+ if ((response_id == GTK_RESPONSE_OK) && (callback_mode != MODE_INIT)) { - const gchar *new_name = - gtk_entry_get_text(GTK_ENTRY(dialog->name_entry)); - const gchar *new_style = dialog->current_style; diff --git a/pioneers-0.12.4-sanitize.patch b/pioneers-0.12.4-sanitize.patch deleted file mode 100644 index 4f279d8..0000000 --- a/pioneers-0.12.4-sanitize.patch +++ /dev/null @@ -1,495 +0,0 @@ ---- ./common/gtk/aboutbox.c.sanitize 2008-03-26 17:20:57.000000000 -0400 -+++ ./common/gtk/aboutbox.c 2011-07-29 09:47:15.982733045 -0400 -@@ -37,10 +37,9 @@ - - void aboutbox_display(const gchar * title, const gchar ** authors) - { -- GtkWidget *splash = NULL, *view = NULL; -+ GtkWidget *view = NULL; - GtkTextBuffer *buffer = NULL; - GtkTextIter iter; -- gchar *imagefile = NULL; - gint i; - - if (about != NULL) { -@@ -58,22 +57,11 @@ - g_signal_connect(G_OBJECT(about), "destroy", - G_CALLBACK(gtk_widget_destroyed), &about); - -- imagefile = g_build_filename(DATADIR, "pixmaps", "pioneers", -- "splash.png", NULL); -- splash = gtk_image_new_from_file(imagefile); -- g_free(imagefile); -- -- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about)->vbox), splash, FALSE, -- FALSE, 0); -- - buffer = gtk_text_buffer_new(NULL); - gtk_text_buffer_get_start_iter(buffer, &iter); - gtk_text_buffer_create_tag(buffer, "bold", - "weight", PANGO_WEIGHT_BOLD, NULL); - -- gtk_text_buffer_insert(buffer, &iter, -- _("Pioneers is based upon the excellent\n" -- "Settlers of Catan board game.\n"), -1); - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, - _("Version:"), -1, - "bold", NULL); ---- ./docs/pioneers-meta-server.6.sanitize 2009-09-22 01:34:57.000000000 -0400 -+++ ./docs/pioneers-meta-server.6 2011-07-29 09:47:15.982733045 -0400 -@@ -8,8 +8,10 @@ - - .SH DESCRIPTION - .B Pioneers --is an implementation of the popular, award-winning "Settlers of Catan" --board game. It uses a client/server model for networked play. This program -+is a computerized version of a well known strategy board game. The -+goal of the game is to colonize an island. The players play the first -+colonists hence the name pioneers. -+It uses a client/server model for networked play. This program - provides a piece of network infrastructure that helps match pioneers clients to - pioneers servers. Casual players of pioneers probably do not need to run this - program. ---- ./docs/pioneers.6.sanitize 2009-09-16 14:34:29.000000000 -0400 -+++ ./docs/pioneers.6 2011-07-29 09:47:15.984733005 -0400 -@@ -1,6 +1,6 @@ - .TH pioneers 6 "April 9, 2006" "pioneers" - .SH NAME --pioneers \- network implementation of Settlers of Catan -+pioneers \- Turnbased board strategy game (colonize an island) - - .SH SYNOPSIS - .B pioneers -@@ -24,8 +24,9 @@ - command. - .PP - .B Pioneers --is an implementation of the popular, award-winning "Settlers of Catan" --board game for the GNOME desktop environment. It uses a client/server -+is a computerized version of a well known strategy board game. The -+goal of the game is to colonize an island. The players play the first -+colonists hence the name pioneers. It uses a client/server - model for networked play of between two and eight players. You will - need to connect to a machine running either \fBpioneers-server-gtk\fP - or \fBpioneers-server-console\fP to play. An AI client, \fBpioneersai\fP, ---- ./docs/pioneers-server-console.6.sanitize 2008-05-04 12:58:54.000000000 -0400 -+++ ./docs/pioneers-server-console.6 2011-07-29 09:47:15.983733025 -0400 -@@ -48,8 +48,9 @@ - command. - .PP - .B Pioneers --is an implementation of the popular, award-winning "Settlers of Catan" --board game for the GNOME desktop environment. It uses a client/server -+is a computerized version of a well known strategy board game. The -+goal of the game is to colonize an island. The players play the first -+colonists hence the name pioneers. It uses a client/server - model for networked play of between two and eight players. This program - provides a console-only server that \fBpioneers\fP clients can connect - to. ---- ./docs/pioneers-server-gtk.6.sanitize 2008-05-04 12:58:54.000000000 -0400 -+++ ./docs/pioneers-server-gtk.6 2011-07-29 09:47:15.984733005 -0400 -@@ -12,8 +12,9 @@ - command. - .PP - .B Pioneers --is an implementation of the popular, award-winning "Settlers of Catan" --board game for the GNOME desktop environment. It uses a client/server -+is a computerized version of a well known strategy board game. The -+goal of the game is to colonize an island. The players play the first -+colonists hence the name pioneers. It uses a client/server - model for networked play of between two and eight players. This program - provides a GUI-configurable stand-alone server which you connect to - from ---- ./docs/pioneersai.6.sanitize 2005-06-30 02:30:27.000000000 -0400 -+++ ./docs/pioneersai.6 2011-07-29 09:47:15.984733005 -0400 -@@ -26,8 +26,9 @@ - command. - .PP - .B Pioneers --is an emulation of the Settlers of Catan board game which can --be played over the internet. This is an AI player -+is a computerized version of a well known strategy board game. The -+goal of the game is to colonize an island. The players play the first -+colonists hence the name pioneers. This is an AI player - implementation that can take part in Pioneers games. - - .SH OPTIONS ---- ./ChangeLog.sanitize 2011-01-26 07:46:22.000000000 -0500 -+++ ./ChangeLog 2011-07-29 09:47:15.978733125 -0400 -@@ -4081,7 +4081,7 @@ - - 2001-03-09 Matt Waggoner - -- * One of the official rule variants for Settlers of Catan is -+ * One of the official rule variants is - to disallow rolling a 7 on the first two rounds. This has been - added as a feature of gnocatan, as well as an additional variant: - always reroll 7s. These are accessed from the console server ---- ./README.sanitize 2007-08-05 09:14:39.000000000 -0400 -+++ ./README 2011-07-29 09:47:15.978733125 -0400 -@@ -1,8 +1,8 @@ - Pioneers - --Pioneers is an Internet playable implementation of the Settlers of --Catan board game. The aim is to remain as faithful to the board game --as is possible. -+Pioneers is a computerized version of a well known strategy board game. The -+goal of the game is to colonize an island. The players play the first -+colonists hence the name pioneers. - - Playing the Game - ================ ---- ./po/pt.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/pt.po 2011-07-29 09:47:16.003732623 -0400 -@@ -2380,14 +2380,6 @@ - "Maior bónus de descoberta de ilha: %d\n" - "Total: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers é baseado no excelente\n" --"jogo de tabuleiro 'Os Descobridores de Catan'.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Versão:" ---- ./po/ja.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/ja.po 2011-07-29 09:47:16.000732683 -0400 -@@ -2383,14 +2383,6 @@ - "最大島数発見ボーナス: %d\n" - "合計: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"パイオニアは、カタンの植民　という\n" --"すばらしいボードゲームが元になっています.\n" -- - #: ../common/gtk/aboutbox.c:78 - #, fuzzy - msgid "Version:" ---- ./po/af.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/af.po 2011-07-29 09:47:15.986732965 -0400 -@@ -2378,14 +2378,6 @@ - "Total: %d" - msgstr "" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioniers is gebaseer op die uitstekende\n" --"bordspel \"Settlers of Catan\".\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Weergawe:" ---- ./po/hu.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/hu.po 2011-07-29 09:47:15.997732743 -0400 -@@ -2389,14 +2389,6 @@ - "Maximum sziget felfedezés bónusz: %d\n" - "Összesen: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"A Pioneers a kíváló táblajáték a\n" --"Catan telepesei alapján készült.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Verzió:" ---- ./po/nl.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/nl.po 2011-07-29 09:47:16.001732663 -0400 -@@ -2380,14 +2380,6 @@ - "Hoogste aantal ontdekkingspunten: %d\n" - "Totaal: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioniers is gebaseerd op\n" --"het bordspel \"De kolonisten van Catan\".\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Versie:" ---- ./po/sv.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/sv.po 2011-07-29 09:47:16.005732583 -0400 -@@ -2389,14 +2389,6 @@ - "Maximal upptäcktsbonus för öar: %d\n" - "Totalt: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers är baserad på det utmärkta\n" --"brädspelet Settlers of Catan.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Version:" ---- ./po/cs.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/cs.po 2011-07-29 09:47:15.988732925 -0400 -@@ -2374,14 +2374,6 @@ - "Maximální bonus za objevení ostrovů: %d\n" - "Celkem: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers je založeno na skvělé\n" --"deskové hře Osadníci z Katanu.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Verze:" ---- ./po/de.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/de.po 2011-07-29 09:47:15.991732865 -0400 -@@ -2383,14 +2383,6 @@ - "Größter Insel-Entdeckungs-Bonus: %d\n" - "Gesamt: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers basiert auf dem exzellenten\n" --"Brettspiel 'Die Siedler von Catan'.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Version:" ---- ./po/fr.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/fr.po 2011-07-29 09:47:15.995732783 -0400 -@@ -2390,14 +2390,6 @@ - "Bonus maximum pour la découverte d'iles : %d\n" - "Total : %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers est basé sur l'excellent\n" --"jeu de plateau 'Les colons de Catane'.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Version :" ---- ./po/it.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/it.po 2011-07-29 09:47:15.998732723 -0400 -@@ -2380,14 +2380,6 @@ - "Massimo bonus per scoperta isole: %d\n" - "Totale: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers è basato sull'eccellente gioco\n" --"I Coloni di Catan.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Versione:" ---- ./po/es.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/es.po 2011-07-29 09:47:15.993732823 -0400 -@@ -2381,14 +2381,6 @@ - "Bonificación máxima por descubrimiento de islas: %d\n" - "Total: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers está basado en el excelente\n" --"juego de mesa 'Los fundadores de Catán'.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Versión:" ---- ./po/da.po.sanitize 2011-01-26 05:31:58.000000000 -0500 -+++ ./po/da.po 2011-07-29 09:47:15.990732885 -0400 -@@ -2385,14 +2385,6 @@ - "Maksimal bonus for opdagelse af øer: %d\n" - "Total: %d" - --#: ../common/gtk/aboutbox.c:75 --msgid "" --"Pioneers is based upon the excellent\n" --"Settlers of Catan board game.\n" --msgstr "" --"Pioneers er baseret på det fantastiske\n" --"Settlers og Catan brædtspil.\n" -- - #: ../common/gtk/aboutbox.c:78 - msgid "Version:" - msgstr "Version:" ---- ./client/gtk/offline.c.sanitize 2010-10-07 12:15:15.000000000 -0400 -+++ ./client/gtk/offline.c 2011-07-29 09:47:15.980733085 -0400 -@@ -89,7 +89,6 @@ - && !connectable); - break; - case GUI_CONNECT_TRY: -- gui_show_splash_page(FALSE, NULL); - gui_set_net_status(_("Connecting")); - - connectable = FALSE; ---- ./client/gtk/gui.c.sanitize 2010-10-26 11:24:09.000000000 -0400 -+++ ./client/gtk/gui.c 2011-07-29 09:47:15.979733105 -0400 -@@ -55,14 +55,12 @@ - TRADE_PAGE, /* trading interface */ - QUOTE_PAGE, /* submit quotes page */ - LEGEND_PAGE, /* legend */ -- SPLASH_PAGE /* splash screen */ - }; - - static GtkWidget *map_notebook; /* map area panel */ - static GtkWidget *trade_page; /* trade page in map area */ - static GtkWidget *quote_page; /* quote page in map area */ - static GtkWidget *legend_page; /* legend page in map area */ --static GtkWidget *splash_page; /* splash page in map area */ - - static GtkWidget *develop_notebook; /* development card area panel */ - -@@ -85,8 +83,6 @@ - - static GList *rules_callback_list = NULL; - --#define PIONEERS_PIXMAP_SPLASH "pioneers/splash.png" -- - static const gchar *pioneers_pixmaps[] = { - PIONEERS_PIXMAP_DICE, - PIONEERS_PIXMAP_TRADE, -@@ -607,50 +603,6 @@ - gtk_widget_hide(legend_page); - } - --void gui_show_splash_page(gboolean show, GtkWidget * chat_widget) --{ -- static GtkWidget *widget = NULL; -- if (chat_widget != NULL) -- widget = chat_widget; -- g_assert(widget != NULL); -- -- chat_set_grab_focus_on_update(TRUE); -- if (show) { -- gtk_widget_show(splash_page); -- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook), -- SPLASH_PAGE); -- gtk_widget_hide(widget); -- } else { -- gtk_widget_hide(splash_page); -- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook), -- MAP_PAGE); -- gtk_widget_show(widget); -- } --} -- --static GtkWidget *splash_build_page(void) --{ -- GtkWidget *pm; -- GtkWidget *viewport; -- gchar *filename; -- -- filename = g_build_filename(DATADIR, "pixmaps", "pioneers", -- "splash.png", NULL); -- pm = gtk_image_new_from_file(filename); -- g_free(filename); -- -- /* The viewport avoids that the pixmap is drawn up into the tab area if -- * it's too large for the space provided. */ -- viewport = gtk_viewport_new(NULL, NULL); -- gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), -- GTK_SHADOW_NONE); -- gtk_widget_show(viewport); -- gtk_widget_set_size_request(pm, 1, 1); -- gtk_widget_show(pm); -- gtk_container_add(GTK_CONTAINER(viewport), pm); -- return viewport; --} -- - static GtkWidget *build_map_panel(void) - { - GtkWidget *lbl; -@@ -716,13 +668,6 @@ - gui_show_legend_page(FALSE); - theme_register_callback(G_CALLBACK(gui_theme_changed)); - -- /* Tab page name, shown for the splash screen */ -- lbl = gtk_label_new(_("Welcome to Pioneers")); -- gtk_widget_show(lbl); -- splash_page = splash_build_page(); -- gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook), -- splash_page, lbl, SPLASH_PAGE); -- - return map_notebook; - } - -@@ -865,7 +810,6 @@ - gtk_paned_pack1(GTK_PANED(vpaned), build_map_panel(), TRUE, TRUE); - - chat_panel = gtk_vbox_new(FALSE, 0); -- gui_show_splash_page(TRUE, chat_panel); - - panel = chat_build_panel(); - frontend_gui_register(panel, GUI_DISCONNECT, NULL); ---- ./client/help/C/pioneers-C.omf.sanitize 2005-06-30 02:46:06.000000000 -0400 -+++ ./client/help/C/pioneers-C.omf 2011-07-29 09:47:15.980733085 -0400 -@@ -17,8 +17,8 @@ - - - -- Pioneers is an Internet playable implementation of -- the Settlers of Catan board game. -+ Pioneers is a computerized version of a well known strategy board game. -+ The goal of the game is to colonize an island. - - - user's guide ---- ./client/help/C/pioneers.xml.sanitize 2008-05-04 12:58:54.000000000 -0400 -+++ ./client/help/C/pioneers.xml 2011-07-29 09:47:15.981733065 -0400 -@@ -58,10 +58,11 @@ - - Authors and History - -- Pioneers is a GNOME game based upon the board game Settlers of Catan -- created by Mayfair Games. Pioneers was originally authored by Dave -- Cole in the spring and summer of 1999, under the name Gnocatan. -- Dave wanted to be able to -+ Pioneers is a computerized version of a well known strategy board game. -+ The goal of the game is to colonize an island. The players play the -+ first colonists hence the name pioneers. -+ Pioneers was originally authored by Dave Cole in the spring and summer -+ of 1999. Dave wanted to be able to - play the game without having to travel, so he developed a computer - implementation of the game. The Pioneers project stalled in the late - summer of 1999 and saw little development until the early spring of -@@ -79,9 +80,6 @@ - on the user interface. - - -- In June 2005 the project was renamed from Gnocatan to Pioneers. -- -- - To be continued... - - diff --git a/pioneers-14.1-sanitize.patch b/pioneers-14.1-sanitize.patch new file mode 100644 index 0000000..4d856e9 --- /dev/null +++ b/pioneers-14.1-sanitize.patch @@ -0,0 +1,545 @@ +diff -uNr pioneers-14.1-orig/ChangeLog pioneers-14.1/ChangeLog +--- pioneers-14.1-orig/ChangeLog 2012-05-28 05:51:07.000000000 -0400 ++++ pioneers-14.1/ChangeLog 2012-07-06 12:06:36.405527958 -0400 +@@ -4493,7 +4493,7 @@ + + 2001-03-09 Matt Waggoner + +- * One of the official rule variants for Settlers of Catan is ++ * One of the official rule variants is + to disallow rolling a 7 on the first two rounds. This has been + added as a feature of gnocatan, as well as an additional variant: + always reroll 7s. These are accessed from the console server +diff -uNr pioneers-14.1-orig/client/gtk/gui.c pioneers-14.1/client/gtk/gui.c +--- pioneers-14.1-orig/client/gtk/gui.c 2012-01-13 15:16:29.000000000 -0500 ++++ pioneers-14.1/client/gtk/gui.c 2012-07-06 12:58:05.964512864 -0400 +@@ -57,14 +57,12 @@ + TRADE_PAGE, /* trading interface */ + QUOTE_PAGE, /* submit quotes page */ + LEGEND_PAGE, /* legend */ +- SPLASH_PAGE /* splash screen */ + }; + + static GtkWidget *map_notebook; /* map area panel */ + static GtkWidget *trade_page; /* trade page in map area */ + static GtkWidget *quote_page; /* quote page in map area */ + static GtkWidget *legend_page; /* legend page in map area */ +-static GtkWidget *splash_page; /* splash page in map area */ + + static GtkWidget *develop_notebook; /* development card area panel */ + +@@ -87,8 +85,6 @@ + + static GList *rules_callback_list = NULL; + +-#define PIONEERS_PIXMAP_SPLASH "pioneers/splash.png" +- + static const gchar *pioneers_pixmaps[] = { + PIONEERS_PIXMAP_DICE, + PIONEERS_PIXMAP_TRADE, +@@ -650,50 +646,6 @@ + gtk_widget_hide(legend_page); + } + +-void gui_show_splash_page(gboolean show, GtkWidget * chat_widget) +-{ +- static GtkWidget *widget = NULL; +- if (chat_widget != NULL) +- widget = chat_widget; +- g_assert(widget != NULL); +- +- chat_set_grab_focus_on_update(TRUE); +- if (show) { +- gtk_widget_show(splash_page); +- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook), +- SPLASH_PAGE); +- gtk_widget_hide(widget); +- } else { +- gtk_widget_hide(splash_page); +- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook), +- MAP_PAGE); +- gtk_widget_show(widget); +- } +-} +- +-static GtkWidget *splash_build_page(void) +-{ +- GtkWidget *pm; +- GtkWidget *viewport; +- gchar *filename; +- +- filename = g_build_filename(DATADIR, "pixmaps", "pioneers", +- "splash.png", NULL); +- pm = gtk_image_new_from_file(filename); +- g_free(filename); +- +- /* The viewport avoids that the pixmap is drawn up into the tab area if +- * it's too large for the space provided. */ +- viewport = gtk_viewport_new(NULL, NULL); +- gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), +- GTK_SHADOW_NONE); +- gtk_widget_show(viewport); +- gtk_widget_set_size_request(pm, 1, 1); +- gtk_widget_show(pm); +- gtk_container_add(GTK_CONTAINER(viewport), pm); +- return viewport; +-} +- + static GtkWidget *build_map_panel(void) + { + GtkWidget *lbl; +@@ -759,13 +711,6 @@ + gui_show_legend_page(FALSE); + theme_register_callback(G_CALLBACK(gui_theme_changed)); + +- /* Tab page name, shown for the splash screen */ +- lbl = gtk_label_new(_("Welcome to Pioneers")); +- gtk_widget_show(lbl); +- splash_page = splash_build_page(); +- gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook), +- splash_page, lbl, SPLASH_PAGE); +- + return map_notebook; + } + +@@ -908,7 +853,6 @@ + gtk_paned_pack1(GTK_PANED(vpaned), build_map_panel(), TRUE, TRUE); + + chat_panel = gtk_vbox_new(FALSE, 0); +- gui_show_splash_page(TRUE, chat_panel); + + panel = chat_build_panel(); + frontend_gui_register(panel, GUI_DISCONNECT, NULL); +diff -uNr pioneers-14.1-orig/client/help/C/pioneers-C.omf pioneers-14.1/client/help/C/pioneers-C.omf +--- pioneers-14.1-orig/client/help/C/pioneers-C.omf 2005-06-30 02:46:06.000000000 -0400 ++++ pioneers-14.1/client/help/C/pioneers-C.omf 2012-07-06 12:58:38.840449310 -0400 +@@ -17,8 +17,8 @@ + + + +- Pioneers is an Internet playable implementation of +- the Settlers of Catan board game. ++ Pioneers is a computerized version of a well known strategy board game. ++ The goal of the game is to colonize an island. + + + user's guide +diff -uNr pioneers-14.1-orig/client/help/C/pioneers.xml pioneers-14.1/client/help/C/pioneers.xml +--- pioneers-14.1-orig/client/help/C/pioneers.xml 2011-06-13 13:32:48.000000000 -0400 ++++ pioneers-14.1/client/help/C/pioneers.xml 2012-07-06 12:59:44.139323414 -0400 +@@ -58,10 +58,11 @@ + + Authors and History + +- Pioneers is a GNOME game based upon the board game Settlers of Catan +- created by Mayfair Games. Pioneers was originally authored by Dave +- Cole in the spring and summer of 1999, under the name Gnocatan. +- Dave wanted to be able to ++ Pioneers is a computerized version of a well known strategy board game. ++ The goal of the game is to colonize an island. The players play the ++ first colonists hence the name pioneers. ++ Pioneers was originally authored by Dave Cole in the spring and summer ++ of 1999. Dave wanted to be able to + play the game without having to travel, so he developed a computer + implementation of the game. The Pioneers project stalled in the late + summer of 1999 and saw little development until the early spring of +@@ -79,9 +80,6 @@ + on the user interface. + + +- In June 2005 the project was renamed from Gnocatan to Pioneers. +- +- + To be continued... + + +diff -uNr pioneers-14.1-orig/common/gtk/aboutbox.c pioneers-14.1/common/gtk/aboutbox.c +--- pioneers-14.1-orig/common/gtk/aboutbox.c 2011-11-07 17:00:35.000000000 -0500 ++++ pioneers-14.1/common/gtk/aboutbox.c 2012-07-06 12:01:43.002111293 -0400 +@@ -37,10 +37,9 @@ + + void aboutbox_display(const gchar * title, const gchar ** authors) + { +- GtkWidget *splash = NULL, *view = NULL; ++ GtkWidget *view = NULL; + GtkTextBuffer *buffer = NULL; + GtkTextIter iter; +- gchar *imagefile = NULL; + gint i; + + if (about != NULL) { +@@ -58,23 +57,11 @@ + g_signal_connect(G_OBJECT(about), "destroy", + G_CALLBACK(gtk_widget_destroyed), &about); + +- imagefile = g_build_filename(DATADIR, "pixmaps", "pioneers", +- "splash.png", NULL); +- splash = gtk_image_new_from_file(imagefile); +- g_free(imagefile); +- +- gtk_box_pack_start(GTK_BOX +- (gtk_dialog_get_content_area +- (GTK_DIALOG(about))), splash, FALSE, FALSE, 0); +- + buffer = gtk_text_buffer_new(NULL); + gtk_text_buffer_get_start_iter(buffer, &iter); + gtk_text_buffer_create_tag(buffer, "bold", + "weight", PANGO_WEIGHT_BOLD, NULL); + +- gtk_text_buffer_insert(buffer, &iter, +- _("Pioneers is based upon the excellent\n" +- "Settlers of Catan board game.\n"), -1); + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, + _("Version:"), -1, + "bold", NULL); +diff -uNr pioneers-14.1-orig/docs/pioneers.6 pioneers-14.1/docs/pioneers.6 +--- pioneers-14.1-orig/docs/pioneers.6 2012-01-09 14:38:00.000000000 -0500 ++++ pioneers-14.1/docs/pioneers.6 2012-07-06 12:03:52.292851882 -0400 +@@ -1,6 +1,6 @@ + .TH pioneers 6 "January 8, 2012" "pioneers" + .SH NAME +-pioneers \- network implementation of Settlers of Catan ++pioneers \- Turnbased board strategy game (colonize an island) + + .SH SYNOPSIS + .B pioneers +@@ -18,8 +18,9 @@ + command. + .PP + .B Pioneers +-is an implementation of the popular, award-winning "Settlers of Catan" +-board game for the GNOME desktop environment. It uses a client/server ++is a computerized version of a well known strategy board game. The ++goal of the game is to colonize an island. The players play the first ++colonists hence the name pioneers. It uses a client/server + model for networked play of between two and eight players. You will + need to connect to a machine running either \fBpioneers-server-gtk\fP + or \fBpioneers-server-console\fP to play. An AI client, \fBpioneersai\fP, +diff -uNr pioneers-14.1-orig/docs/pioneersai.6 pioneers-14.1/docs/pioneersai.6 +--- pioneers-14.1-orig/docs/pioneersai.6 2012-01-09 14:38:00.000000000 -0500 ++++ pioneers-14.1/docs/pioneersai.6 2012-07-06 12:06:15.293569350 -0400 +@@ -25,8 +25,9 @@ + command. + .PP + .B Pioneers +-is an emulation of the Settlers of Catan board game which can +-be played over the internet. This is a computer player ++is a computerized version of a well known strategy board game. The ++goal of the game is to colonize an island. The players play the first ++colonists hence the name pioneers. This is an AI player + implementation that can take part in Pioneers games. + + .SH OPTIONS +diff -uNr pioneers-14.1-orig/docs/pioneers-meta-server.6 pioneers-14.1/docs/pioneers-meta-server.6 +--- pioneers-14.1-orig/docs/pioneers-meta-server.6 2012-01-09 14:38:00.000000000 -0500 ++++ pioneers-14.1/docs/pioneers-meta-server.6 2012-07-06 12:02:49.421977495 -0400 +@@ -8,8 +8,10 @@ + + .SH DESCRIPTION + .B Pioneers +-is an implementation of the popular, award-winning "Settlers of Catan" +-board game. It uses a client/server model for networked play. This program ++is a computerized version of a well known strategy board game. The ++goal of the game is to colonize an island. The players play the first ++colonists hence the name pioneers. ++It uses a client/server model for networked play. This program + provides a piece of network infrastructure that helps match pioneers clients to + pioneers servers. Casual players of pioneers probably do not need to run this + program. +diff -uNr pioneers-14.1-orig/docs/pioneers-server-console.6 pioneers-14.1/docs/pioneers-server-console.6 +--- pioneers-14.1-orig/docs/pioneers-server-console.6 2012-01-09 14:38:00.000000000 -0500 ++++ pioneers-14.1/docs/pioneers-server-console.6 2012-07-06 12:04:25.951785015 -0400 +@@ -12,8 +12,9 @@ + command. + .PP + .B Pioneers +-is an implementation of the popular, award-winning "Settlers of Catan" +-board game for the GNOME desktop environment. It uses a client/server ++is a computerized version of a well known strategy board game. The ++goal of the game is to colonize an island. The players play the first ++colonists hence the name pioneers. It uses a client/server + model for networked play of between two and eight players. This program + provides a console-only server that \fBpioneers\fP clients can connect + to. +diff -uNr pioneers-14.1-orig/docs/pioneers-server-gtk.6 pioneers-14.1/docs/pioneers-server-gtk.6 +--- pioneers-14.1-orig/docs/pioneers-server-gtk.6 2012-01-09 14:38:00.000000000 -0500 ++++ pioneers-14.1/docs/pioneers-server-gtk.6 2012-07-06 12:05:32.460653582 -0400 +@@ -12,8 +12,9 @@ + command. + .PP + .B Pioneers +-is an implementation of the popular, award-winning "Settlers of Catan" +-board game for the GNOME desktop environment. It uses a client/server ++is a computerized version of a well known strategy board game. The ++goal of the game is to colonize an island. The players play the first ++colonists hence the name pioneers. It uses a client/server + model for networked play of between two and eight players. This program + provides a GUI-configurable stand-alone server which you connect to + from +diff -uNr pioneers-14.1-orig/po/af.po pioneers-14.1/po/af.po +--- pioneers-14.1-orig/po/af.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/af.po 2012-07-06 12:56:23.145712318 -0400 +@@ -2451,14 +2451,6 @@ + "Total: %d" + msgstr "" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioniers is gebaseer op die uitstekende\n" +-"bordspel \"Settlers of Catan\".\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Weergawe:" +diff -uNr pioneers-14.1-orig/po/cs.po pioneers-14.1/po/cs.po +--- pioneers-14.1-orig/po/cs.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/cs.po 2012-07-06 12:55:39.589797205 -0400 +@@ -2453,14 +2453,6 @@ + "Maximální bonus za objevení ostrovů: %d\n" + "Celkem: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers je založeno na skvělé\n" +-"deskové hře Osadníci z Katanu.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Verze:" +diff -uNr pioneers-14.1-orig/po/da.po pioneers-14.1/po/da.po +--- pioneers-14.1-orig/po/da.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/da.po 2012-07-06 12:56:17.978722379 -0400 +@@ -2461,14 +2461,6 @@ + "Maksimal bonus for opdagelse af øer: %d\n" + "Total: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers er baseret på det fantastiske\n" +-"Settlers og Catan brædtspil.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Version:" +diff -uNr pioneers-14.1-orig/po/de.po pioneers-14.1/po/de.po +--- pioneers-14.1-orig/po/de.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/de.po 2012-07-06 12:55:32.840810376 -0400 +@@ -2464,14 +2464,6 @@ + "Größter Insel-Entdeckungs-Bonus: %d\n" + "Gesamt: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers basiert auf dem exzellenten\n" +-"Brettspiel 'Die Siedler von Catan'.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Version:" +diff -uNr pioneers-14.1-orig/po/en_GB.po pioneers-14.1/po/en_GB.po +--- pioneers-14.1-orig/po/en_GB.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/en_GB.po 2012-07-06 12:56:10.382737159 -0400 +@@ -2459,14 +2459,6 @@ + "Maximum island discovery bonus: %d\n" + "Total: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Version:" +diff -uNr pioneers-14.1-orig/po/es.po pioneers-14.1/po/es.po +--- pioneers-14.1-orig/po/es.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/es.po 2012-07-06 12:55:27.152821492 -0400 +@@ -2461,14 +2461,6 @@ + "Bonificación máxima por descubrimiento de islas: %d\n" + "Total: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers está basado en el excelente\n" +-"juego de mesa 'Los fundadores de Catán'.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Versión:" +diff -uNr pioneers-14.1-orig/po/fr.po pioneers-14.1/po/fr.po +--- pioneers-14.1-orig/po/fr.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/fr.po 2012-07-06 12:56:04.791748066 -0400 +@@ -2471,14 +2471,6 @@ + "Bonus maximum pour la découverte d'iles : %d\n" + "Total : %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers est basé sur l'excellent\n" +-"jeu de plateau 'Les colons de Catane'.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Version :" +diff -uNr pioneers-14.1-orig/po/gl.po pioneers-14.1/po/gl.po +--- pioneers-14.1-orig/po/gl.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/gl.po 2012-07-06 12:55:19.101837224 -0400 +@@ -2462,14 +2462,6 @@ + "Bonificación máxima por descubrimento de illas: %d\n" + "Total: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneiros está baseado no excelente\n" +-"xogo de mesa «Os fundadores de Catan».\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Versión:" +diff -uNr pioneers-14.1-orig/po/hu.po pioneers-14.1/po/hu.po +--- pioneers-14.1-orig/po/hu.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/hu.po 2012-07-06 12:55:56.416764385 -0400 +@@ -2465,14 +2465,6 @@ + "Maximum sziget felfedezés bónusz: %d\n" + "Összesen: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"A Pioneers a kíváló táblajáték a\n" +-"Catan telepesei alapján készült.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Verzió:" +diff -uNr pioneers-14.1-orig/po/it.po pioneers-14.1/po/it.po +--- pioneers-14.1-orig/po/it.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/it.po 2012-07-06 12:55:08.590857779 -0400 +@@ -2461,14 +2461,6 @@ + "Massimo bonus per scoperta isole: %d\n" + "Totale: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers è basato sull'eccellente gioco\n" +-"I Coloni di Catan.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Versione:" +diff -uNr pioneers-14.1-orig/po/ja.po pioneers-14.1/po/ja.po +--- pioneers-14.1-orig/po/ja.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/ja.po 2012-07-06 12:55:51.992773008 -0400 +@@ -2460,14 +2460,6 @@ + "最大島数発見ボーナス: %d\n" + "合計: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"パイオニアは、カタンの植民　という\n" +-"すばらしいボードゲームが元になっています.\n" +- + #: ../common/gtk/aboutbox.c:79 + #, fuzzy + msgid "Version:" +diff -uNr pioneers-14.1-orig/po/nl.po pioneers-14.1/po/nl.po +--- pioneers-14.1-orig/po/nl.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/nl.po 2012-07-06 12:54:56.870880718 -0400 +@@ -2459,14 +2459,6 @@ + "Hoogste aantal ontdekkingspunten: %d\n" + "Totaal: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioniers is gebaseerd op\n" +-"het bordspel \"De kolonisten van Catan\".\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Versie:" +diff -uNr pioneers-14.1-orig/po/pt.po pioneers-14.1/po/pt.po +--- pioneers-14.1-orig/po/pt.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/pt.po 2012-07-06 12:55:45.940784816 -0400 +@@ -2457,14 +2457,6 @@ + "Maior bónus de descoberta de ilha: %d\n" + "Total: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers é baseado no excelente\n" +-"jogo de tabuleiro 'Os Descobridores de Catan'.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Versão:" +diff -uNr pioneers-14.1-orig/po/sv.po pioneers-14.1/po/sv.po +--- pioneers-14.1-orig/po/sv.po 2012-05-28 05:52:46.000000000 -0400 ++++ pioneers-14.1/po/sv.po 2012-07-06 12:54:48.322897458 -0400 +@@ -2459,14 +2459,6 @@ + "Maximal upptäcktsbonus för öar: %d\n" + "Totalt: %d" + +-#: ../common/gtk/aboutbox.c:76 +-msgid "" +-"Pioneers is based upon the excellent\n" +-"Settlers of Catan board game.\n" +-msgstr "" +-"Pioneers är baserad på det utmärkta\n" +-"brädspelet Settlers of Catan.\n" +- + #: ../common/gtk/aboutbox.c:79 + msgid "Version:" + msgstr "Version:" +diff -uNr pioneers-14.1-orig/README pioneers-14.1/README +--- pioneers-14.1-orig/README 2007-08-05 09:14:39.000000000 -0400 ++++ pioneers-14.1/README 2012-07-06 12:07:00.622480567 -0400 +@@ -1,8 +1,8 @@ + Pioneers + +-Pioneers is an Internet playable implementation of the Settlers of +-Catan board game. The aim is to remain as faithful to the board game +-as is possible. ++Pioneers is a computerized version of a well known strategy board game. The ++goal of the game is to colonize an island. The players play the first ++colonists hence the name pioneers. + + Playing the Game + ================ diff --git a/pioneers.spec b/pioneers.spec index e4c21ff..5886888 100644 --- a/pioneers.spec +++ b/pioneers.spec @@ -1,14 +1,13 @@ Name: pioneers -Version: 0.12.4 -Release: 3%{?dist} +Version: 14.1 +Release: 1%{?dist} Summary: Turnbased board strategy game (colonize an island) Group: Amusements/Games License: GPLv2+ URL: http://pio.sourceforge.net/ Source0: http://downloads.sourceforge.net/pio/%{name}-%{version}.tar.gz -Patch0: pioneers-0.12.4-sanitize.patch +Patch0: pioneers-14.1-sanitize.patch Patch1: pioneers-0.12.3-dso.patch -Patch2: pioneers-0.12.2-namechange.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnome-devel gtk2-devel gettext scrollkeeper intltool BuildRequires: perl(XML::Parser) desktop-file-utils @@ -41,9 +40,8 @@ edited graphically. %prep %setup -q -%patch0 -p1 -z .sanitize +#%patch0 -p1 -z .sanitize %patch1 -p1 -z .dso -%patch2 -p1 -z .namechange %build @@ -104,15 +102,25 @@ scrollkeeper-update -q || : %{_datadir}/applications/fedora-%{name}-server.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/pixmaps/%{name}-server.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-server.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/icons/hicolor/scalable/apps/%{name}-server.svg %files editor %defattr(-,root,root,-) %{_bindir}/%{name}-editor %{_datadir}/applications/fedora-%{name}-editor.desktop %{_datadir}/pixmaps/%{name}-editor.png - +%{_datadir}/icons/hicolor/48x48/apps/%{name}-editor.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}-editor.svg %changelog +* Fri Jul 6 2012 Paul W. Frields - 14.1-1 +- New upstream version 14.1 +- Details: http://sourceforge.net/mailarchive/message.php?msg_id=29324203 +- Update sanitize patch, remove obsolete user name change patch + * Sat Jan 14 2012 Fedora Release Engineering - 0.12.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 17c244c..4877b28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44717b9315f9a4f5a8651c467ae4822c pioneers-0.12.4.tar.gz +ed6bc9e4d16c0ba95a016a590092023a pioneers-14.1.tar.gz