Patch (hack) to prevent executable stack requirement

(Portage version: 2.1.3_rc6)

5 files changed, 103 insertions, 24 deletions

diff --git a/games-strategy/gwp/ChangeLog b/games-strategy/gwp/ChangeLog
index 4e53d80574ea..b7840ace2aea 100644
--- a/games-strategy/gwp/ChangeLog
+++ b/games-strategy/gwp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/gwp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/gwp/ChangeLog,v 1.2 2006/10/02 19:21:53 nyhm Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/gwp/ChangeLog,v 1.3 2007/07/02 01:24:59 nyhm Exp $
+
+*gwp-0.4.0-r2 (02 Jul 2007)
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/gwp-0.4.0-exec-stack.patch, files/gwp-0.4.0-gcc41.patch,
+  -gwp-0.4.0-r1.ebuild, +gwp-0.4.0-r2.ebuild:
+  Patch (hack) to prevent executable stack requirement
 
 *gwp-0.4.0-r1 (02 Oct 2006)
 
diff --git a/games-strategy/gwp/files/digest-gwp-0.4.0-r1 b/games-strategy/gwp/files/digest-gwp-0.4.0-r2
index f76e7f947da9..f76e7f947da9 100644
--- a/games-strategy/gwp/files/digest-gwp-0.4.0-r1
+++ b/games-strategy/gwp/files/digest-gwp-0.4.0-r2
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
index 264186e7b526..fa7ee5c5443c 100644
--- a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
+++ b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
@@ -29,15 +29,6 @@
      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);
-   }
 --- 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 @@
@@ -114,13 +105,3 @@
      PyObject *dict = (PyObject *)user_data;
      GwpTorpSpec *torpspec = GWP_TORPSPEC(value);
  
---- src/vcr.c.old	2006-03-05 01:25:37.000000000 +0900
-+++ src/vcr.c	2006-03-05 01:40:19.000000000 +0900
-@@ -2692,7 +2692,6 @@
- {
-   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");
diff --git a/games-strategy/gwp/gwp-0.4.0-r1.ebuild b/games-strategy/gwp/gwp-0.4.0-r2.ebuild
index b85c14e8e566..7c1fb8193512 100644
--- a/games-strategy/gwp/gwp-0.4.0-r1.ebuild
+++ b/games-strategy/gwp/gwp-0.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/gwp/gwp-0.4.0-r1.ebuild,v 1.2 2006/10/02 19:48:00 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/gwp/gwp-0.4.0-r2.ebuild,v 1.1 2007/07/02 01:24:59 nyhm Exp $
 
 inherit eutils gnome2
 
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-exec-stack.patch
 	sed -i \
 		-e '/ -O1/d' \
 		-e '/ -g$/d' \