diff options
Diffstat (limited to 'games-strategy/gwp/files')
| -rw-r--r-- | games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch | 89 | ||||
| -rw-r--r-- | games-strategy/gwp/files/gwp-0.4.0-gcc41.patch | 107 |
2 files changed, 196 insertions, 0 deletions
diff --git a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch new file mode 100644 index 000000000000..1458b7ba1dfd --- /dev/null +++ b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch @@ -0,0 +1,89 @@ +--- src/starchart.c ++++ src/starchart.c +@@ -3187,10 +3187,16 @@ + /** + * Initializes starchart constellations. + */ ++static GSList *planets; ++ ++static void add_item (gpointer key, gpointer value, gpointer user_data) { ++ /* GSList *p_list = (GSList *)user_data; */ ++ planets = g_slist_append (planets, value); ++} ++ + static void + init_starchart_constellations (void) + { +- GSList *planets = NULL; + GSList *ppq[TOTAL_QUADS]; + GSList *list_nearby = NULL; + GwpPlanet *planet_a, *planet_b; +@@ -3199,10 +3205,6 @@ + gdouble wx, wy; + gdouble ax, ay, bx, by, zoom; + +- static void add_item (gpointer key, gpointer value, gpointer user_data) { +- /* GSList *p_list = (GSList *)user_data; */ +- planets = g_slist_append (planets, value); +- } + + g_hash_table_foreach (planet_list, (GHFunc)add_item, NULL); + +--- src/vcr.c ++++ src/vcr.c +@@ -2687,12 +2687,29 @@ + return( retval ); + } + ++static gchar *name; ++ ++static void foreach_func( gpointer key, gpointer value, gpointer user_data ) ++{ ++ GwpShip *ship = GWP_SHIP( value ); ++ GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) ); ++ gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist"); ++ gint curr = idlist[0]; ++ ++ if( gwp_ship_is_mine( ship ) ) ++ { ++ curr++; ++ idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) ); ++ idlist[0]++; ++ g_sprintf( name, "%03d: ", idlist[curr] ); ++ strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 ); ++ gtk_combo_box_append_text( box, name ); ++ } ++} + + void vcr_populate_ship_a_list( GtkWidget *widget, gpointer user_data ) + { +- gchar *name; + gint *idlist; +- static void foreach_func( gpointer key, gpointer value, gpointer user_data ); + + /* test if list is already populated */ + idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist"); +@@ -2708,23 +2725,7 @@ + GtkWidget *combox = lookup_widget("vcr_comboboxentry_sel_ext_shp_a"); + g_object_set_data(G_OBJECT(combox), "shipidlist", idlist ); + +- void foreach_func( gpointer key, gpointer value, gpointer user_data ) +- { +- GwpShip *ship = GWP_SHIP( value ); +- GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) ); +- gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist"); +- gint curr = idlist[0]; + +- if( gwp_ship_is_mine( ship ) ) +- { +- curr++; +- idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) ); +- idlist[0]++; +- g_sprintf( name, "%03d: ", idlist[curr] ); +- strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 ); +- gtk_combo_box_append_text( box, name ); +- } +- } + + g_hash_table_foreach( ship_list, (GHFunc) foreach_func, user_data ); + diff --git a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch new file mode 100644 index 000000000000..fa7ee5c5443c --- /dev/null +++ b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch @@ -0,0 +1,107 @@ +--- src/gwp-game-state.c.old 2006-03-05 00:56:48.000000000 +0900 ++++ src/gwp-game-state.c 2006-03-05 00:57:38.000000000 +0900 +@@ -749,7 +749,7 @@ + /* Connect to interesting signals */ + /**********************************/ + /* Selected planets */ +- static void planet_conn (gpointer key, gpointer value, gpointer self) { ++ void planet_conn (gpointer key, gpointer value, gpointer self) { + g_signal_connect (GWP_PLANET(value), + "selected", + G_CALLBACK(selected_planet_notification), +@@ -757,7 +757,7 @@ + } + g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self); + /* Selected ships */ +- static void ship_conn (gpointer key, gpointer value, gpointer self) { ++ void ship_conn (gpointer key, gpointer value, gpointer self) { + g_signal_connect (GWP_SHIP(value), + "selected", + G_CALLBACK(selected_ship_notification), +--- src/starchart.c.old 2006-03-05 01:13:39.000000000 +0900 ++++ src/starchart.c 2006-03-05 01:18:04.000000000 +0900 +@@ -2111,7 +2111,7 @@ + /*******************/ + /* Planets signals */ + /*******************/ +- static void planet_conn (gpointer key, gpointer value, gpointer data) { ++ void planet_conn (gpointer key, gpointer value, gpointer data) { + g_signal_connect (GWP_PLANET(value), + "property-changed", + G_CALLBACK(update_planet_notification), +--- src/vp_utils.c.old 2006-03-05 01:18:14.000000000 +0900 ++++ src/vp_utils.c 2006-03-05 01:18:52.000000000 +0900 +@@ -2590,7 +2590,7 @@ + gwp_planet_set_colonists (planet, atoi(p_clans)); + + /* Compare func */ +- static gint compare_race (gconstpointer race, gconstpointer adj) { ++ gint compare_race (gconstpointer race, gconstpointer adj) { + gchar *race_str = gwp_race_get_adjective(GWP_RACE(race)); + if (strncmp(race_str, adj, strlen(adj)) == 0) + return 0; +@@ -2639,7 +2639,7 @@ + /* Assign known planet values */ + gwp_planet_set_is_known (planet, TRUE); + /* Compare func */ +- static gint compare_race (gconstpointer race, gconstpointer adj) { ++ gint compare_race (gconstpointer race, gconstpointer adj) { + gchar *race_str = gwp_race_get_adjective(GWP_RACE(race)); + if (strncmp(race_str, adj, strlen(adj)) == 0) + return 0; +--- src/gwp-py-mappings.c.old 2006-03-05 01:28:39.000000000 +0900 ++++ src/gwp-py-mappings.c 2006-03-05 01:29:30.000000000 +0900 +@@ -8657,7 +8657,7 @@ + { + PyObject *ret = PyDict_New(); + +- static void add_ship (gpointer key, gpointer value, gpointer user_data) { ++ void add_ship (gpointer key, gpointer value, gpointer user_data) { + PyObject *dict = (PyObject *)user_data; + GwpShip *ship = GWP_SHIP(value); + +@@ -8679,7 +8679,7 @@ + { + PyObject *ret = PyDict_New(); + +- static void add_planet (gpointer key, gpointer value, gpointer user_data) { ++ void add_planet (gpointer key, gpointer value, gpointer user_data) { + PyObject *dict = (PyObject *)user_data; + GwpPlanet *planet = GWP_PLANET(value); + +@@ -8701,7 +8701,7 @@ + { + PyObject *ret = PyDict_New(); + +- static void add_hullspec (gpointer value, gpointer user_data) { ++ void add_hullspec (gpointer value, gpointer user_data) { + PyObject *dict = (PyObject *)user_data; + GwpHullSpec *hullspec = GWP_HULLSPEC(value); + +@@ -8723,7 +8723,7 @@ + { + PyObject *ret = PyDict_New(); + +- static void add_engspec (gpointer value, gpointer user_data) { ++ void add_engspec (gpointer value, gpointer user_data) { + PyObject *dict = (PyObject *)user_data; + GwpEngSpec *engspec = GWP_ENGSPEC(value); + +@@ -8745,7 +8745,7 @@ + { + PyObject *ret = PyDict_New(); + +- static void add_beamspec (gpointer value, gpointer user_data) { ++ void add_beamspec (gpointer value, gpointer user_data) { + PyObject *dict = (PyObject *)user_data; + GwpBeamSpec *beamspec = GWP_BEAMSPEC(value); + +@@ -8767,7 +8767,7 @@ + { + PyObject *ret = PyDict_New(); + +- static void add_torpspec (gpointer value, gpointer user_data) { ++ void add_torpspec (gpointer value, gpointer user_data) { + PyObject *dict = (PyObject *)user_data; + GwpTorpSpec *torpspec = GWP_TORPSPEC(value); + |