Bug#335252: gwp 0.4.0-1.1 NMU

[Matej Vela]

Hello,

I'm doing an NMU of gwp to fix #335252; diff attached.

Thanks,

Matej

diff -u gwp-0.4.0/debian/changelog gwp-0.4.0/debian/changelog
--- gwp-0.4.0/debian/changelog
+++ gwp-0.4.0/debian/changelog
@@ -1,3 +1,11 @@
+gwp (0.4.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply upstream patch to fix build failure with gcc 4.0.
+    Closes: #335252.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Sat, 28 Jan 2006 13:02:08 +0100
+
 gwp (0.4.0-1) unstable; urgency=low
   
   * Upstream release 0.4.0
only in patch2:
unchanged:
--- gwp-0.4.0.orig/src/gwp-game-state.c
+++ gwp-0.4.0/src/gwp-game-state.c
@@ -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),
only in patch2:
unchanged:
--- gwp-0.4.0.orig/src/starchart.c
+++ gwp-0.4.0/src/starchart.c
@@ -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),
@@ -3199,7 +3199,7 @@
   gdouble wx, wy;
   gdouble ax, ay, bx, by, zoom;
 
-  static void add_item (gpointer key, gpointer value, gpointer user_data) {
+  void add_item (gpointer key, gpointer value, gpointer user_data) {
     /*    GSList *p_list = (GSList *)user_data; */
     planets = g_slist_append (planets, value);
   }
only in patch2:
unchanged:
--- gwp-0.4.0.orig/src/vp_utils.c
+++ gwp-0.4.0/src/vp_utils.c
@@ -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;
only in patch2:
unchanged:
--- gwp-0.4.0.orig/src/vcr.c
+++ gwp-0.4.0/src/vcr.c
@@ -2692,7 +2692,7 @@
 {
   gchar *name;
   gint *idlist;
-  static void foreach_func( gpointer key, gpointer value, gpointer user_data );
+  /*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");
only in patch2:
unchanged:
--- gwp-0.4.0.orig/src/gwp-py-mappings.c
+++ gwp-0.4.0/src/gwp-py-mappings.c
@@ -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);