Patch (hack) to prevent executable stack requirement

Package-Manager: portage-2.1.3_rc6

6 files changed, 132 insertions, 39 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/Manifest b/games-strategy/gwp/Manifest
index 7e4c5221d772..124a6b777447 100644
--- a/games-strategy/gwp/Manifest
+++ b/games-strategy/gwp/Manifest
@@ -1,20 +1,34 @@
-AUX gwp-0.4.0-gcc41.patch 4829 RMD160 f717f8f22b33133ebebb1abff8af86c01cb33385 SHA1 43d85c608e597186df7be4c0d9eca5e077f6e220 SHA256 86f6c8cf335cd8b7bda850a8cc7bdb2ada744a4cf9bfe5aeab5aff1dc5a10297
-MD5 dd693feb49e2dbcce485a4daec2ead1e files/gwp-0.4.0-gcc41.patch 4829
-RMD160 f717f8f22b33133ebebb1abff8af86c01cb33385 files/gwp-0.4.0-gcc41.patch 4829
-SHA256 86f6c8cf335cd8b7bda850a8cc7bdb2ada744a4cf9bfe5aeab5aff1dc5a10297 files/gwp-0.4.0-gcc41.patch 4829
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gwp-0.4.0-exec-stack.patch 2842 RMD160 b4b99b2c9b70fc4ca33e75180049d35319d13809 SHA1 fdff1b9cb8e1dc81ddabcb3e90dfc0eb18be762e SHA256 645f0b054e476ce11e7d4b5c7fe6a9402122afb02dc69b70b15c51c808aa80d5
+MD5 f3855d871ec1c4023b011c1bc39ff724 files/gwp-0.4.0-exec-stack.patch 2842
+RMD160 b4b99b2c9b70fc4ca33e75180049d35319d13809 files/gwp-0.4.0-exec-stack.patch 2842
+SHA256 645f0b054e476ce11e7d4b5c7fe6a9402122afb02dc69b70b15c51c808aa80d5 files/gwp-0.4.0-exec-stack.patch 2842
+AUX gwp-0.4.0-gcc41.patch 4100 RMD160 1151fa736252784f6d0f8c72e9ca46ae145a090c SHA1 869a369c99f526a6be98b34f35869671aa7d4937 SHA256 36f37f2f7e2444830fd5216df3060ee74eab5108dd0daa2ce71970821ed05367
+MD5 aade7ffdca94f53dc4da7e54862eb59a files/gwp-0.4.0-gcc41.patch 4100
+RMD160 1151fa736252784f6d0f8c72e9ca46ae145a090c files/gwp-0.4.0-gcc41.patch 4100
+SHA256 36f37f2f7e2444830fd5216df3060ee74eab5108dd0daa2ce71970821ed05367 files/gwp-0.4.0-gcc41.patch 4100
 DIST gwp-0.4.0.tar.gz 2294453 RMD160 59b585551cb075c4823d7ccfa3172b55314f0a11 SHA1 6451ca679c1e6cbf917c1012b4d3d6092dd5ac0a SHA256 e2734e019e2c3ef28cb0abd524c193ec5beb35d2bc8ba3e10652fac45c8bbe99
-EBUILD gwp-0.4.0-r1.ebuild 1147 RMD160 5135f3e6513a62d83b778e54b41fcee3bb55b471 SHA1 e69fc9179e5004d417c7d3faffa64046bc791f3c SHA256 c0352a6f70dcd01e1c188178463e207bf44f099b5b203248e89ae867eeb1813e
-MD5 ac0d931a7d22ef4cfb19a8a8857a06e9 gwp-0.4.0-r1.ebuild 1147
-RMD160 5135f3e6513a62d83b778e54b41fcee3bb55b471 gwp-0.4.0-r1.ebuild 1147
-SHA256 c0352a6f70dcd01e1c188178463e207bf44f099b5b203248e89ae867eeb1813e gwp-0.4.0-r1.ebuild 1147
-MISC ChangeLog 741 RMD160 b79d1e3ea4ca4849ca0caab133309d63a7080d9a SHA1 7a0b6fd32ec294d09150aac0229b4213e3eeee31 SHA256 a1396f1e9bbbf6465a446018ad56af749eb584bf36cd7161e97ec5100ef79250
-MD5 c397a78c5b31d2f20de3cb7c99413113 ChangeLog 741
-RMD160 b79d1e3ea4ca4849ca0caab133309d63a7080d9a ChangeLog 741
-SHA256 a1396f1e9bbbf6465a446018ad56af749eb584bf36cd7161e97ec5100ef79250 ChangeLog 741
+EBUILD gwp-0.4.0-r2.ebuild 1191 RMD160 916435a6ada33796136a2370155e816a5ada493d SHA1 87e1caf7a36c6b06a57b87057586e99a7002dc6a SHA256 b9768559085b2d9ae9262503834fd4b4520d5fcbab3e4b9b9df0e5cb6e769496
+MD5 30d623e06a406eae628c766328201f75 gwp-0.4.0-r2.ebuild 1191
+RMD160 916435a6ada33796136a2370155e816a5ada493d gwp-0.4.0-r2.ebuild 1191
+SHA256 b9768559085b2d9ae9262503834fd4b4520d5fcbab3e4b9b9df0e5cb6e769496 gwp-0.4.0-r2.ebuild 1191
+MISC ChangeLog 986 RMD160 0328ab2cf7155e08663027da17e542a17f3e18a6 SHA1 b91acd940bfd701b1a7d2f579c09a3c504dae073 SHA256 bef5775dcdd407f37324f055faa45ca0e2cc341c2f75f4da5cce84e7f3936da4
+MD5 cf6ed55e586bec92afc3c75beddb10fd ChangeLog 986
+RMD160 0328ab2cf7155e08663027da17e542a17f3e18a6 ChangeLog 986
+SHA256 bef5775dcdd407f37324f055faa45ca0e2cc341c2f75f4da5cce84e7f3936da4 ChangeLog 986
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 17c44155aeb18bce564cac3b08960de1 files/digest-gwp-0.4.0-r1 232
-RMD160 29ec4148f3ec3e3b02e4427bee5696eaa93e6168 files/digest-gwp-0.4.0-r1 232
-SHA256 e1f113f513462a185e10a61c59270418ca02f641b18faed60f10a484c5c4a664 files/digest-gwp-0.4.0-r1 232
+MD5 17c44155aeb18bce564cac3b08960de1 files/digest-gwp-0.4.0-r2 232
+RMD160 29ec4148f3ec3e3b02e4427bee5696eaa93e6168 files/digest-gwp-0.4.0-r2 232
+SHA256 e1f113f513462a185e10a61c59270418ca02f641b18faed60f10a484c5c4a664 files/digest-gwp-0.4.0-r2 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGiFPxdz7hIScOURERAgQUAKCTpM0DFlaBKIiW5ykRVfLLQzfOkwCfeJ2V
+csC6+svBp0z7w0U4A0jSYOA=
+=Mm2A
+-----END PGP SIGNATURE-----
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' \