summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-04-05 08:31:57 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-04-05 08:31:57 +0000
commitcb8995d8ecd629f774a9d4d881e4180b4c8a1a01 (patch)
tree4a480715f12596d3fb30c2ee874b73105b955e2b /games-action
parentBump (diff)
downloadhistorical-cb8995d8ecd629f774a9d4d881e4180b4c8a1a01.tar.gz
historical-cb8995d8ecd629f774a9d4d881e4180b4c8a1a01.tar.bz2
historical-cb8995d8ecd629f774a9d4d881e4180b4c8a1a01.zip
add patch from N Alex to avoid segfault with no trees (bug #545494)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'games-action')
-rw-r--r--games-action/extreme-tuxracer/ChangeLog8
-rw-r--r--games-action/extreme-tuxracer/Manifest5
-rw-r--r--games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild8
-rw-r--r--games-action/extreme-tuxracer/files/extreme-tuxracer-0.6.0-segfault.patch8
4 files changed, 22 insertions, 7 deletions
diff --git a/games-action/extreme-tuxracer/ChangeLog b/games-action/extreme-tuxracer/ChangeLog
index f21b5c341b34..1300c34e33cf 100644
--- a/games-action/extreme-tuxracer/ChangeLog
+++ b/games-action/extreme-tuxracer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/extreme-tuxracer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/ChangeLog,v 1.21 2014/10/02 15:09:48 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/ChangeLog,v 1.22 2015/04/05 08:31:49 mr_bones_ Exp $
+
+ 05 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/extreme-tuxracer-0.6.0-segfault.patch, extreme-tuxracer-0.6.0.ebuild:
+ add patch from N Alex to avoid segfault with no trees (bug #545494)
02 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
extreme-tuxracer-0.6.0.ebuild:
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index b607219ee689..ac05e6c493eb 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,6 +1,7 @@
AUX extreme-tuxracer-0.6.0-libsdl.patch 1077 SHA256 ac885770dc933f999bb46d07ee8ebca4dfa439cfd01ba96558d74fa4a97f6570 SHA512 412e305af036ccc2a3b0943a87d1e78e5f86f50b93ccf6d992b51b4641f0f7443a1a319245424d8fdd39b37493ee12143bf35e60d66f422a8a144fb4099c333d WHIRLPOOL baf0f5e3df4550cfbef0c3406dce3c0b6db0d3857c5f8ee548e19e77a3993fb916780adbb08cf06aa3f652c681331c7db319baf790ffadb90cc83c9db1833d41
+AUX extreme-tuxracer-0.6.0-segfault.patch 223 SHA256 04dd0b80bcef6c14585e9694d4986f64d4bbe900dfe571c3347849bead6c32ed SHA512 f5e83a677c941b6042c238a4e86c780de607a8a518b2d3808199c0b6e3705f468451399e136c407e68cc6845c2ffb6cf170005b53e132c5152a4aee46494a0d1 WHIRLPOOL efa6e07619e4c1db6b62b1675e1e56d0de22d9a3b03a9ec6adfc74b611b9fd3c46d53ec11ea6220dc527edf5e27af9a44229305db74aab4e8df3c15993b692fd
AUX extreme-tuxracer.svg 9151 SHA256 f30dbfb4651ebc4c54feb7885a4d856f890652d6e3a06b15e04904ea65fd5136 SHA512 754011ac42e3b0c703baf0d45b2f117b32ba368251479ca85038868acc9d0d9a39f49b3c6e2e171073dd4ae8c6859a69d315f00bb3b7faae2806efc434362a02 WHIRLPOOL a53b1a0f1119fd9125400de99b5a774f2e5bb5c9fe0e19ba22a14eb9e27e0a6152fdf119d94e279a45b85bdcf9b8a91ce451ec5eb75bd07c0611c9655d9d9573
DIST etr-0.6.0.tar.xz 32889668 SHA256 44312719a1e9aa33e5aa0c8ad50bb52df702d64fd2d16bf2abda62ee27bf893a SHA512 c3127dd1f8d9b856cc42808713a53b48a64821f020ecf3bfaae8be96e36eaddfadfedcf394d445ea1f49df650763b50d35a5ad9cac03308bcb1a4a473e4906d8 WHIRLPOOL d003d5ef070ed15d4521cc2025ceb372b18b69f3172065159b5fd18bf5f2126da4cc8c179b95311c63afd5093ec2700483697544ade7ad02e1f255e1cdfc44e4
-EBUILD extreme-tuxracer-0.6.0.ebuild 1328 SHA256 a2f5a4392042a559af844b9a97384e238465d0a36c96a1106ca584bdeb5daee2 SHA512 8c0b29546d689d2b33c0f3535408d51bee18b0a8557aae2b3b556067a01a75958656bcaeb8b379c50c04bd344606309576ac41dd5093a72864193472c1f06b7d WHIRLPOOL 338ecbe3a7ab61c366344995ba5a544bcc763b98c3ce9bf15b925e1d9a5e49f952341a0a3ab7a625c4490320d1859ce772c6c82dc115f0b2805fb2227c8e43f6
-MISC ChangeLog 3491 SHA256 3a39165beaa58f10a924a60ecad52e80b381c2b518b04d9549b82e00641cc29a SHA512 177845d66f3758ec139ea0f22fadd89f3908e93f74e9457ab835e0e57681a0fba9eeaf262fea79854b113e8143f8486f1901e8ab273eec7c690a9f4e651d3422 WHIRLPOOL eafce31715c1f92370b61f26db13f924bf02fc928d6ceb7fa080ffb1ac6bf1be643194555d8146d48a93c6aed25f927911e620b5b16ca97539b18caf837d769f
+EBUILD extreme-tuxracer-0.6.0.ebuild 1370 SHA256 5004434afe9b87d62bfdd256d4c0b2ac33ff0901d8fb7f7621292b2d2999ac6f SHA512 e0bb4df6ea3f10a0dc36537ad2f5ccc2f12d5494048e4e6497d599452a7b99bc89e1b529e20aae7daf1f1d93cb71874da5c39a7995ee2c447813dc3a2f2502e3 WHIRLPOOL 3106305c1da1d6dc31021d0fbf7fef710a3028bfa0ef8bb6e978040ed5d73709ab865fe459c6c8143be07e125fd98bcfd530c1038c1e1641102836c53b4393ef
+MISC ChangeLog 3696 SHA256 80ba26d2a25a0f6dfa7aeb4df4989ce015e4955d3afce519faa7059bbb568dc5 SHA512 abfa34a886b59154c72e3926ac70f25d5687868b4876c4b7b92ab3559e86ec0c45ddac527c57c51de5bca96bb205465d7dc841cf53ec39f0a8dd3cf7a8613e56 WHIRLPOOL fc8f50f4138f99ae2361aad796395a90f34a09a745e83d936ab2cf8501adbb959e4e88b825979869bdbcd2ea94ac0c0e27391df61f3a3e87594942c02bb4d593
MISC metadata.xml 346 SHA256 811f0ea7e4f9d82fdf3d2e75dfcccbb081e2cb5e7b2da1121d87d18733149daa SHA512 91f05704174d9da763f81e10ada3b90c2f3dea98ffde92ed4d6faeea9fe3efa66280e2580412c5985b5866b4351d97914f3075b868025632c2598c006bb6980e WHIRLPOOL 16fa659745e51f6a79de496568bc0be88c93b7479d706be413e5200d89e368824a46b75d82c6edeeab36532441d79fcab21a9b2008a154b5218239f70c39c687
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild
index 097c9fd35429..5e2edc7b72ff 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild,v 1.8 2014/10/02 15:09:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.6.0.ebuild,v 1.9 2015/04/05 08:31:49 mr_bones_ Exp $
EAPI=5
inherit eutils autotools gnome2-utils games
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/etr-${PV/_/}
src_prepare() {
- epatch "${FILESDIR}"/${P}-libsdl.patch
+ epatch \
+ "${FILESDIR}"/${P}-libsdl.patch \
+ "${FILESDIR}"/${P}-segfault.patch
# kind of ugly in there so we'll do it ourselves
sed -i -e '/SUBDIRS/s/resources doc//' Makefile.am || die
eautoreconf
diff --git a/games-action/extreme-tuxracer/files/extreme-tuxracer-0.6.0-segfault.patch b/games-action/extreme-tuxracer/files/extreme-tuxracer-0.6.0-segfault.patch
new file mode 100644
index 000000000000..c51014444267
--- /dev/null
+++ b/games-action/extreme-tuxracer/files/extreme-tuxracer-0.6.0-segfault.patch
@@ -0,0 +1,8 @@
+--- physics.cpp
++++ physics.cpp
+@@ -126,3 +126,5 @@
+ TCollidable *trees = &Course.CollArr[0];
++ if (trees == NULL)
++ return false;
+ size_t num_trees = Course.CollArr.size();
+ size_t tree_type = trees[0].tree_type;