fix crash bug #103403

(Portage version: 2.1_pre7-r5)

5 files changed, 66 insertions, 9 deletions

diff --git a/games-action/orbital-eunuchs-sniper/ChangeLog b/games-action/orbital-eunuchs-sniper/ChangeLog
index f89cafc77012..f2e9423200cd 100644
--- a/games-action/orbital-eunuchs-sniper/ChangeLog
+++ b/games-action/orbital-eunuchs-sniper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/orbital-eunuchs-sniper
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/ChangeLog,v 1.7 2004/11/09 08:57:23 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/ChangeLog,v 1.8 2006/04/21 19:40:39 tupone Exp $
+
+  21 Apr 2006; <Tupone@gentoo.org>
+  +files/orbital-eunuchs-sniper-1.29-gcc41.patch,
+  orbital-eunuchs-sniper-1.29.ebuild:
+  Fixing crash like the one at bug #103403 by Simon Koch
 
   09 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/1.29-ai.patch,
   orbital-eunuchs-sniper-1.29.ebuild:
diff --git a/games-action/orbital-eunuchs-sniper/Manifest b/games-action/orbital-eunuchs-sniper/Manifest
index da2483e25e07..0050384872cd 100644
--- a/games-action/orbital-eunuchs-sniper/Manifest
+++ b/games-action/orbital-eunuchs-sniper/Manifest
@@ -1,6 +1,21 @@
-MD5 4e854f8ff40fc0a113524aa771b99de8 ChangeLog 1281
-MD5 164659530b23f68e2351fe87a8065f7e orbital-eunuchs-sniper-1.29.ebuild 1495
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2382b3d8925217566c20b9f256cdfd6e ChangeLog 1462
+RMD160 f996f443291274e5b286445293ddefba384f964f ChangeLog 1462
+SHA256 6b5b775f25966b392a97721d926245666f92a3fab2730f5526b17099b444a40f ChangeLog 1462
 MD5 477238dc90d5014c1170ec2e102d9c6c files/1.29-ai.patch 1861
-MD5 f97829ecc792f2794277b8aec6a11e07 files/digest-orbital-eunuchs-sniper-1.29 80
+RMD160 85de41c7fc12ae7336776334ee89593920e6f183 files/1.29-ai.patch 1861
+SHA256 a181dc874ce8710a11f3d4a4e447864e3e2a75507c4c143e1eb43b4711ee2e17 files/1.29-ai.patch 1861
 MD5 8c689e156112d15da15aa7a5753e7f1c files/1.29-gentoo-paths.patch 798
+RMD160 396ecfd589ff0e646dd5c88fd1644673824e3ee8 files/1.29-gentoo-paths.patch 798
+SHA256 13d24f55708b5be6706104a42ab484310e44371183bd1256546d96325262dc98 files/1.29-gentoo-paths.patch 798
+MD5 01604af804be8c692963cbb8a7878881 files/digest-orbital-eunuchs-sniper-1.29 286
+RMD160 81903fce1a569c284852eb9addbcfec8f5528452 files/digest-orbital-eunuchs-sniper-1.29 286
+SHA256 3607678341c6869a96ed83e6dfc96cfbb8d99e329ffd4bfa9572f7b9e594b09f files/digest-orbital-eunuchs-sniper-1.29 286
+MD5 69a27565a11dabe5b2da7cdd08a04ec9 files/orbital-eunuchs-sniper-1.29-gcc41.patch 1134
+RMD160 59f7026fe09f5304a4032a3080e1c03c6eb783ed files/orbital-eunuchs-sniper-1.29-gcc41.patch 1134
+SHA256 29b6acab5299e793452c93d73f8a5f9afb60678a9f7f268cf020768cd4a7faeb files/orbital-eunuchs-sniper-1.29-gcc41.patch 1134
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 679863fa2b842ef49fed7997f5674518 orbital-eunuchs-sniper-1.29.ebuild 1530
+RMD160 b24a0cb9fcec28265534cf749401106c0553271b orbital-eunuchs-sniper-1.29.ebuild 1530
+SHA256 125149ff2726aeeb74989015f67ddcb619f321c0ae838f86c00694c6556b53d8 orbital-eunuchs-sniper-1.29.ebuild 1530
diff --git a/games-action/orbital-eunuchs-sniper/files/digest-orbital-eunuchs-sniper-1.29 b/games-action/orbital-eunuchs-sniper/files/digest-orbital-eunuchs-sniper-1.29
index 1ac20e7d503b..3f95b3909718 100644
--- a/games-action/orbital-eunuchs-sniper/files/digest-orbital-eunuchs-sniper-1.29
+++ b/games-action/orbital-eunuchs-sniper/files/digest-orbital-eunuchs-sniper-1.29
@@ -1 +1,3 @@
 MD5 78701333a1fe43b7198d55586b77c46d orbital_eunuchs_sniper-1.29.tar.gz 4043177
+RMD160 49520028f6f21e9163c37fcf14030a4868a01b01 orbital_eunuchs_sniper-1.29.tar.gz 4043177
+SHA256 45d4aef3d911780e5cfa69717d7ef751273ee81beb265551e9b7eae15ac8799b orbital_eunuchs_sniper-1.29.tar.gz 4043177
diff --git a/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.29-gcc41.patch b/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.29-gcc41.patch
new file mode 100644
index 000000000000..2574f3125ffc
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.29-gcc41.patch
@@ -0,0 +1,34 @@
+--- src/ui.cpp.old	2006-04-21 21:27:16.000000000 +0200
++++ src/ui.cpp	2006-04-21 21:32:36.000000000 +0200
+@@ -1285,6 +1285,7 @@
+   if (!widget) return 0;
+   objtype = oesui_props_get_string(widget->props, "type");
+   if (!objtype) return 0;
++  updatefunc = NULL;
+   if (0 == strcasecmp(objtype, "toplevel"))
+       updatefunc = oesui_toplevel_update;
+   else if (0 == strcasecmp(objtype, "button"))
+@@ -1304,6 +1305,7 @@
+   objtype = oesui_props_get_string(widget->props, "type");
+ //printf("widget_signal on %s\n", objtype);
+   if (!objtype) return 0;
++  sigfunc = NULL;
+   if (0);
+   else if (0 == strcasecmp(objtype, "toplevel"))
+       sigfunc = oesui_toplevel_signal;
+@@ -1323,6 +1325,7 @@
+ 
+   objtype = oesui_props_get_string(widget->props, "type");
+   if (!objtype) return 0;
++  openfunc=NULL;
+   if (0);
+   else if (0 == strcasecmp(objtype, "toplevel"))
+       openfunc = oesui_toplevel_open;
+@@ -1340,6 +1343,7 @@
+ 
+   objtype = oesui_props_get_string(widget->props, "type");
+   if (!objtype) return 0;
++  closefunc=NULL;
+   if (0);
+   else if (0 == strcasecmp(objtype, "toplevel"))
+       closefunc = oesui_toplevel_close;
diff --git a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
index 2e049c0c103f..c8383c6b0662 100644
--- a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
+++ b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild,v 1.9 2004/11/09 08:57:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild,v 1.10 2006/04/21 19:40:39 tupone Exp $
 
 inherit eutils games
 
@@ -27,7 +27,8 @@ src_unpack() {
 		-e 's:datadir="$with_games_dir"::' configure \
 		|| die "sed configure failed"
 	cp -rf "${S}"{,.orig}
-	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
+	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
+		"${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s:GENTOO_DIR:${GAMES_DATADIR}/${MY_PN}:" src/snipe2d.cpp \
 		|| die "sed src/snipe2d.cpp failed"