summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-05-06 16:58:37 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-05-06 16:58:37 +0000
commitf294fc63c2f91b51490af68170be566ec78a2ff2 (patch)
tree252eb475f0a0f5cefd700bc5eb9d239ca7ba0046 /media-sound
parentAdded ~sparc, #50251 (diff)
downloadhistorical-f294fc63c2f91b51490af68170be566ec78a2ff2.tar.gz
historical-f294fc63c2f91b51490af68170be566ec78a2ff2.tar.bz2
historical-f294fc63c2f91b51490af68170be566ec78a2ff2.zip
Patch added to fix bug #49417.
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/audacity/ChangeLog6
-rw-r--r--media-sound/audacity/Manifest5
-rw-r--r--media-sound/audacity/audacity-1.2.0-r1.ebuild8
-rw-r--r--media-sound/audacity/files/audacity-1.2.0-STTypes.patch13
4 files changed, 28 insertions, 4 deletions
diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 73532e903058..7415cdb36c91 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/audacity
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.21 2004/05/04 02:08:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.22 2004/05/06 16:58:37 eradicator Exp $
+
+ 06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ audacity-1.2.0-r1.ebuild, files/audacity-1.2.0-STTypes.patch:
+ Patch added to fix bug #49417.
03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
audacity-1.1.3.ebuild, audacity-1.2.0-r1.ebuild:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index cff123906992..35dfdb922710 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,8 @@
MD5 a3623bd9211a3bb07f20ac7bc9d74769 audacity-1.1.3.ebuild 2080
-MD5 b662ffc78f72aa3df93f71e3dc5037b9 audacity-1.2.0-r1.ebuild 2234
-MD5 7c7baad690fc9cdb5d4cf7061d1402b7 ChangeLog 4786
+MD5 2a3ccebc54154fd41e466ef572768cca audacity-1.2.0-r1.ebuild 2313
+MD5 3e0fd6da192be619507c76ba67bdcd73 ChangeLog 4941
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
MD5 3997cded5596ed884d44484d5a650a5b files/digest-audacity-1.2.0-r1 71
MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
+MD5 e2ae7b2007d03d608173fd4faecc1a06 files/audacity-1.2.0-STTypes.patch 499
MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
diff --git a/media-sound/audacity/audacity-1.2.0-r1.ebuild b/media-sound/audacity/audacity-1.2.0-r1.ebuild
index 0f4a250399f6..541e1349eb9e 100644
--- a/media-sound/audacity/audacity-1.2.0-r1.ebuild
+++ b/media-sound/audacity/audacity-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.2 2004/05/04 02:08:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.3 2004/05/06 16:58:37 eradicator Exp $
inherit eutils
@@ -43,6 +43,12 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-STTypes.patch
+}
+
src_compile() {
local myconf;
diff --git a/media-sound/audacity/files/audacity-1.2.0-STTypes.patch b/media-sound/audacity/files/audacity-1.2.0-STTypes.patch
new file mode 100644
index 000000000000..55fd95cb7db5
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.2.0-STTypes.patch
@@ -0,0 +1,13 @@
+--- lib-src/soundtouch/src/STTypes.h.orig 2004-05-06 09:47:37.808353000 -0700
++++ lib-src/soundtouch/src/STTypes.h 2004-05-06 09:48:18.408353000 -0700
+@@ -49,6 +49,10 @@
+ virtual const char *what() const throw() { return "soundtouch library st_assertion failure"; }
+ };
+
++#if defined(__GNUC__) && __GNUC__ >= 3 /* GCC 3.x */
++#define st_assert(expr) ((expr) ? 0 : throw soundtouch_exception())
++#else
+ #define st_assert(expr) ((expr) ? (void) 0 : throw soundtouch_exception())
++#endif
+
+ #endif