first attempt at patch to fix bug #539658

Package-Manager: portage-2.2.14/cvs/Linux x86_64

5 files changed, 50 insertions, 5 deletions

diff --git a/games-arcade/spacerider/ChangeLog b/games-arcade/spacerider/ChangeLog
index 335a373a2d1d..15b8e82327af 100644
--- a/games-arcade/spacerider/ChangeLog
+++ b/games-arcade/spacerider/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/spacerider
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/spacerider/ChangeLog,v 1.9 2015/02/15 23:19:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/spacerider/ChangeLog,v 1.10 2015/04/01 05:09:52 mr_bones_ Exp $
+
+  01 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/spacerider-0.13-font.patch, +files/spacerider-0.13-gcc49.patch,
+  spacerider-0.13.ebuild:
+  first attempt at patch to fix bug #539658
 
   15 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> spacerider-0.13.ebuild:
   use deps for libsdl
diff --git a/games-arcade/spacerider/Manifest b/games-arcade/spacerider/Manifest
index fcfca8bb9c4d..44c027efc807 100644
--- a/games-arcade/spacerider/Manifest
+++ b/games-arcade/spacerider/Manifest
@@ -1,7 +1,9 @@
+AUX spacerider-0.13-font.patch 405 SHA256 5282b04eecddadc0e0c8c8971eb7c33483458239b530e4ed9b51984e1b7cb371 SHA512 3d584b207b809e69cb4f6227690c840659e8a9e4e242ee70e2870a210470f1d1f22498cae52a33f0b8a06449cf5d74bf60c94add9ff1ee8f3be74f666aa61fc0 WHIRLPOOL c891401333a07314f2758c727ce91b46a9b46ccbb38695268b8921cb16b910567906bff993fb29f92127ee2ca599cc8cff7a494ee7c0076185c712fc8ab4ebd2
 AUX spacerider-0.13-gcc41.patch 464 SHA256 fcedce29dc5d09bb58b3ba2e3758ac0c5921b4233b7a5d6cd5714789db6d94a3 SHA512 5d8a7e98957197e3a5be814922cf175e96071b2ece6014d71d000489803a6850324919217d9519cecbbebb07327d44728aa710cbbd56a10b22e7094604cbe3fe WHIRLPOOL b2f7d6e4d81fb140b95a0b9256e8cb25ba13c753af536190deedefd2784f42db5e23ebf8d6078a5e70a49820e785d932ec1acc69aff7fa3667e3fe6ebb9a3481
+AUX spacerider-0.13-gcc49.patch 767 SHA256 7d8c55c0c029bb4f7495bc2bf87df95ab23df77d325ca626de6d8153bf4cae3d SHA512 8960674333b379eac82c844c7e558edf00286df66e19fd1728837a47a3930c8d7ff3d98f1abd560041f58d4919ef7bd8472670ed92a60ed5ee74ba450bbccadf WHIRLPOOL 59a33f8efd8ca66b4bb75a602825ce101e7f7d8658a64b9e6b1f0831a8d9955bcba2cef30b0bee5e6e6c8cd10775ad70d4d7f407411a356700e84cce2f5265c4
 AUX spacerider-0.13-gentoo.patch 733 SHA256 87f1e6e4fd3155b9fd622c1bacfc5a75446c2e94a8abefda688aecf4b6e0a61d SHA512 5303e0bf13dfde66b0a0b7d522cd317e742330ba7d77ec53daee3d3ae3f0ebd90ed545c57c0c9f601e5f69906a0d8c53be5641ba1564cdff583234fd6fcb22b8 WHIRLPOOL bc40f0c203f01f546319fdc087497689db0cac5529bd6355c718125b38e45450e90b30d71c408663ba989a03015c2a66b40b82253a79c9e8cb1cca6d2f4829d5
 AUX spacerider-0.13-ovflfix.patch 343 SHA256 34a2f406c938ee386f7fff97f3eb3b06e44d3e2d13db970e79751b17314f5c7d SHA512 68ae2d0daf90de0c949f923605ce61275277391d80c3b4c965e6ebb2de92331c8481272e491f6cb81f18cc1818aa559f5a11f6916df8cc4c39045cd1f23e97bb WHIRLPOOL 6bd15519452f37b4f2414172eeed018ee11f67d03ad171844b0d141c72c1dc3b9ee0fee4c89afe2207b2cd3d0f688339c548ab6ccee904a4dab09eba3a244e38
 DIST spacerider-0.13.tar.bz2 283861 SHA256 9314945b7004a64e7f511b7318af3aef5d1ab680577ba97399a8a11ab022678e SHA512 4f8d506abfe242039247d5c4e43c012ded14f3b18de710aea0c9c6d933cb60fde3116008723d44acadd490b3666e107506fad6ee027d2b31c47d118185e0c03e WHIRLPOOL f75ca582565289896ef6e8c0036d0570e03263370fd290ac472aab969c0c9125fb3e1f5f25a9f4266f32e77f4a9b0852d7ac7dd902100624d44c098a0899b6c2
-EBUILD spacerider-0.13.ebuild 1017 SHA256 a4b912a0af3bd754ab26591c340f7122d56066d4d8309804ecaaac5161eda4ae SHA512 d6224a68a119b30155a7e5735b49e7602cf47698d1d878d1b940b6986d68e1e2b9acae9d5929eabba4a60977c900c9866994f6a152719bfbd7c560efed166889 WHIRLPOOL d6d667e483bd5095c2747e921600c6dd17f746472dc1c025fba777686435e11240944f0ab6c213924ad1943db08b58c755d5e9b1a7f1f45c6104ca747091b736
-MISC ChangeLog 1334 SHA256 d242f28a0cfe45ef6dc685671df7e1082a39bc1d5c6eea4f70b25311f68c732b SHA512 82bb9845decc16fe3d99c5244fba905ad40ca1d038965675c793c378253faa9d5aa46cd4ca4770184002f825dac2b708b4842324ae85bf71e8338320394ae3ca WHIRLPOOL 91116dcace512033f8b88f5c9db8ad9aa3baef6efdafea4d587f383da37c591b8f92f6f3150f21155a648ee7cd6bef893c8016a201f07ab1aa7299ffe8723afc
+EBUILD spacerider-0.13.ebuild 1086 SHA256 a337656c45e0bcfc8fcd80d299153d15c336a38ff27a66bdb5146c826eb4ae43 SHA512 18f730eb0d050d4f3963e487441400b0d59e934449ed29fe69b534d904617ca914889974a38a606cb2bec36adcf9732983cdee6018bb892b72758a828ebe7f87 WHIRLPOOL 0d99bd14e42121510a4c2decd09c3aae910d3f1e2a4af2fd1af72b9fab0c6ddd187ce5fbeb635b182c9722bb2d3a8ce795df3cf4cd9ea01b2d4b59c870e40bea
+MISC ChangeLog 1534 SHA256 bb91155d3ad2da807be6d20d528aabe8afb9c0921b8ad0139ba32a2a91afe184 SHA512 bc2fb22788f7cb9d37c4df95bac7436541d844eab5fa3163903fef23bd933de2b028193066245a719606137048539e13f08d6cb8758d6fdfdd1bb29f37d2bed4 WHIRLPOOL e432ece8b1ce8f809b3bf5eef3ace637ae80147b2ffc0db336af7527c26d5d5beb826fac2e2c2cd5f6e0b65aca66a157e4909360e23948a079340d290805d14e
 MISC metadata.xml 266 SHA256 6e65e3f5cf03bf3f47c85b02e6950c95218fc88971a96001fca0ed90c9c32a70 SHA512 9ec9372266bbe356738c9326985d4757d210111309beff7cf3a33b2399d091e12bbdc35b8108ab93c286dc3fcc4ab22ef27f28e761318092b87addcec4ab2a57 WHIRLPOOL 5be520e9ffe64f458696345be3973341fa6889df57acbef742a7694e846391093a923aa83e7fa9bd1a9eb73b6f40e0901d6a435adff3ff246e368eda56e70c08
diff --git a/games-arcade/spacerider/files/spacerider-0.13-font.patch b/games-arcade/spacerider/files/spacerider-0.13-font.patch
new file mode 100644
index 000000000000..914a0466c7fe
--- /dev/null
+++ b/games-arcade/spacerider/files/spacerider-0.13-font.patch
@@ -0,0 +1,14 @@
+Ugly brute-force method for avoiding a double-free segfault on exit.
+Better patch welcome.
+
+--- spacerider.cpp.orig	2015-03-31 23:24:17.770966147 -0400
++++ spacerider.cpp	2015-03-31 23:24:41.592174463 -0400
+@@ -306,8 +306,6 @@
+ 		/* free screen */
+ 		SDL_FreeSurface(screen);
+ 	}
+-	/* call the TTF-Library cleanup function */
+-	TTF_Quit();
+ 
+ 	/* call the NET-Library cleanup function */
+ 	SDLNet_Quit();
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch b/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
new file mode 100644
index 000000000000..d057e7bab730
--- /dev/null
+++ b/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
@@ -0,0 +1,22 @@
+--- effect.cpp.orig	2015-03-31 22:36:53.336131373 -0400
++++ effect.cpp	2015-03-31 22:37:04.359755281 -0400
+@@ -18,7 +18,7 @@
+ void Effect::add(const int x, const int y)
+ {
+ 	object_struct *effect;
+-	if((effect = add_object(x, y)) == NULL)
++	if((effect = add_object(x, y, 0, 0)) == NULL)
+ 	{
+ 		return;
+ 	}
+--- object.h.orig	2015-03-31 22:35:22.939214561 -0400
++++ object.h	2015-03-31 22:37:19.654233441 -0400
+@@ -172,7 +172,7 @@
+ 	return object->next;
+ }
+ 
+-template <class T>struct Object<T>::object_struct *Object<T>::add_object(const int x, const int y, const int speedx = 0, const int speedy = 0)
++template <class T>struct Object<T>::object_struct *Object<T>::add_object(const int x, const int y, const int speedx, const int speedy)
+ {
+ 	object_struct *object;
+ 
diff --git a/games-arcade/spacerider/spacerider-0.13.ebuild b/games-arcade/spacerider/spacerider-0.13.ebuild
index 0a5363e9e134..5c85a1d2bc5c 100644
--- a/games-arcade/spacerider/spacerider-0.13.ebuild
+++ b/games-arcade/spacerider/spacerider-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/spacerider/spacerider-0.13.ebuild,v 1.11 2015/02/15 23:19:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/spacerider/spacerider-0.13.ebuild,v 1.12 2015/04/01 05:09:52 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils games
@@ -25,7 +25,9 @@ RDEPEND=${DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}/${P}"-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
+		"${FILESDIR}"/${P}-ovflfix.patch \
+		"${FILESDIR}"/${P}-gcc49.patch \
+		"${FILESDIR}"/${P}-font.patch
 	sed -i \
 		-e "s:/usr/share/games/spacerider:${GAMES_DATADIR}/${PN}:" \
 		globals.cpp || die