summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-06-12 20:12:08 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-06-12 20:12:08 +0000
commit86a7d8ef45844700f5fb4e8e13f37f6e52351fad (patch)
tree311b6b6c851a104ac563a2e0907b2ae631d33c23 /media-sound
parentConvert to ruby-fakegem. (diff)
downloadgentoo-2-86a7d8ef45844700f5fb4e8e13f37f6e52351fad.tar.gz
gentoo-2-86a7d8ef45844700f5fb4e8e13f37f6e52351fad.tar.bz2
gentoo-2-86a7d8ef45844700f5fb4e8e13f37f6e52351fad.zip
fix segfault while building, bug #320123
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/freebirth/ChangeLog8
-rw-r--r--media-sound/freebirth/files/freebirth-0.3.2-segfault.patch17
-rw-r--r--media-sound/freebirth/freebirth-0.3.2-r1.ebuild5
3 files changed, 26 insertions, 4 deletions
diff --git a/media-sound/freebirth/ChangeLog b/media-sound/freebirth/ChangeLog
index 6c13f2fdaf83..c4e748fa8d65 100644
--- a/media-sound/freebirth/ChangeLog
+++ b/media-sound/freebirth/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/freebirth
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/ChangeLog,v 1.16 2008/02/29 20:05:11 carlo Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/ChangeLog,v 1.17 2010/06/12 20:12:07 aballier Exp $
+
+ 12 Jun 2010; Alexis Ballier <aballier@gentoo.org>
+ freebirth-0.3.2-r1.ebuild, +files/freebirth-0.3.2-segfault.patch:
+ fix segfault while building, bug #320123
29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> freebirth-0.3.2-r1.ebuild:
Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch b/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
new file mode 100644
index 000000000000..2a3a40711f1c
--- /dev/null
+++ b/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=320123
+
+Index: freebirth-0.3.2/oscillator.c
+===================================================================
+--- freebirth-0.3.2.orig/oscillator.c
++++ freebirth-0.3.2/oscillator.c
+@@ -237,8 +237,8 @@ event *event_freq_change_new(int seq_han
+
+ static sample_producer **get_children(osc *this)
+ {
+- static sample_producer *no_kids[] = { NULL };
+- return no_kids;
++ static sample_producer no_kids[] = {{ NULL }};
++ return &no_kids;
+ }
+
+ static char **get_header(osc *this)
diff --git a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
index cc4d0a4c8693..7bccd851ddb9 100644
--- a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
+++ b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/freebirth-0.3.2-r1.ebuild,v 1.8 2008/02/29 20:05:11 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/freebirth-0.3.2-r1.ebuild,v 1.9 2010/06/12 20:12:07 aballier Exp $
inherit eutils toolchain-funcs
@@ -21,6 +21,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-gentoo-2.patch
+ epatch "${FILESDIR}"/${P}-segfault.patch
}
src_compile() {