GCC-3.4 patch. Closes bug #53186.

5 files changed, 71 insertions, 5 deletions

diff --git a/media-sound/alsamixergui/ChangeLog b/media-sound/alsamixergui/ChangeLog
index bc9b3833e8f5..8e7fd1bfea04 100644
--- a/media-sound/alsamixergui/ChangeLog
+++ b/media-sound/alsamixergui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsamixergui
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.14 2004/06/24 23:49:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.15 2004/07/03 00:01:56 fvdpol Exp $
+
+*alsamixergui-0.9.0.1.2-r4 (03 Jul 2004)
+
+  03 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/alsamixergui-0.9.0.1.2-gcc34.patch,
+  +alsamixergui-0.9.0.1.2-r4.ebuild:
+  GCC-3.4 patch. Closes bug #53186
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsamixergui-0.9.0.1.2-r1.ebuild, alsamixergui-0.9.0.1.2-r2.ebuild,
diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
index 21289f9b3ce7..fc5eb54eef7f 100644
--- a/media-sound/alsamixergui/Manifest
+++ b/media-sound/alsamixergui/Manifest
@@ -1,12 +1,15 @@
-MD5 75737d20188ed5d04b101c8880b235a5 alsamixergui-0.9.0.1.2-r2.ebuild 1014
-MD5 f829a7269559fe3022658f108b9e1a5f alsamixergui-0.9.0.1.2.ebuild 1207
+MD5 82284d9a7ca3aba6d80064dda2369736 ChangeLog 2191
 MD5 113c2d66c25c1ad7cc62b5ac8785c690 alsamixergui-0.9.0.1.2-r1.ebuild 1028
+MD5 75737d20188ed5d04b101c8880b235a5 alsamixergui-0.9.0.1.2-r2.ebuild 1014
 MD5 29bea57c649be5418f21a6f51073fde0 alsamixergui-0.9.0.1.2-r3.ebuild 1019
-MD5 82284d9a7ca3aba6d80064dda2369736 ChangeLog 2191
+MD5 f829a7269559fe3022658f108b9e1a5f alsamixergui-0.9.0.1.2.ebuild 1207
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 1d989be2658c31e20c7b40421c52d488 files/fltk-1.1+gcc3.diff 2950
+MD5 a2ff492e709997cfd1758edb326530c7 alsamixergui-0.9.0.1.2-r4.ebuild 1053
 MD5 6ca0194d89c9788252d9e58bb6d2ee8a files/digest-alsamixergui-0.9.0.1.2 74
 MD5 6ca0194d89c9788252d9e58bb6d2ee8a files/digest-alsamixergui-0.9.0.1.2-r1 74
 MD5 6ca0194d89c9788252d9e58bb6d2ee8a files/digest-alsamixergui-0.9.0.1.2-r2 74
 MD5 6ca0194d89c9788252d9e58bb6d2ee8a files/digest-alsamixergui-0.9.0.1.2-r3 74
+MD5 1d989be2658c31e20c7b40421c52d488 files/fltk-1.1+gcc3.diff 2950
 MD5 b41f6aecc3e59693e3daa2ff30ab4142 files/gentoo.diff 2907
+MD5 bbbd9c8764a3e702e0acc8a35bf90f6e files/alsamixergui-0.9.0.1.2-gcc34.patch 557
+MD5 6ca0194d89c9788252d9e58bb6d2ee8a files/digest-alsamixergui-0.9.0.1.2-r4 74
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
new file mode 100644
index 000000000000..f99c18b3fae2
--- /dev/null
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.1 2004/07/03 00:01:56 fvdpol Exp $
+
+IUSE=""
+
+inherit eutils
+
+NATIVE_VER=0.9.0rc1-2
+S=${WORKDIR}/${PN}-${NATIVE_VER}
+
+DESCRIPTION="AlsaMixerGui - a FLTK based amixer Frontend"
+HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/alsamixergui/"
+SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/${PN}-${NATIVE_VER}.tar.gz"
+
+DEPEND="virtual/alsa
+	>=media-libs/alsa-lib-0.9.0_rc1
+	>=media-sound/alsa-utils-0.9.0_rc1
+	>=x11-libs/fltk-1.1.0_rc6"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+LICENSE="GPL-2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gentoo.diff
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	export LDFLAGS="-L/usr/lib/fltk-1.1"
+	export CPPFLAGS="-I/usr/include/fltk-1.1"
+
+	econf || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die
+	dodoc COPYING README AUTHORS ChangeLog
+}
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
new file mode 100644
index 000000000000..d8317e6ba1e5
--- /dev/null
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
@@ -0,0 +1,12 @@
+diff -Nurd alsamixergui-0.9.0rc1-2-old/src/alsamixer.cxx alsamixergui-0.9.0rc1-2/src/alsamixer.cxx
+--- alsamixergui-0.9.0rc1-2-old/src/alsamixer.cxx	2004-06-06 23:35:40.994686104 -0500
++++ alsamixergui-0.9.0rc1-2/src/alsamixer.cxx	2004-06-06 23:36:04.514110608 -0500
+@@ -654,7 +654,7 @@
+       if (joined) {
+ #ifdef ALSAMIXER_GUI
+ 	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
+-	snd_mixer_selem_channel_id_t(int(chn)++))
++	snd_mixer_selem_channel_id_t(int(chn)+1))
+ #else
+ 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
+ #endif
diff --git a/media-sound/alsamixergui/files/digest-alsamixergui-0.9.0.1.2-r4 b/media-sound/alsamixergui/files/digest-alsamixergui-0.9.0.1.2-r4
new file mode 100644
index 000000000000..a47468b6e908
--- /dev/null
+++ b/media-sound/alsamixergui/files/digest-alsamixergui-0.9.0.1.2-r4
@@ -0,0 +1 @@
+MD5 24b74dda2cf77c313c6cba9b062c8feb alsamixergui-0.9.0rc1-2.tar.gz 70255