Fix spontaneous mute problems. Bug #108956

(Portage version: 2.0.53_rc5)

5 files changed, 173 insertions, 11 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 9df4162694c1..afd1ff8b384b 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.137 2005/10/12 23:58:36 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.138 2005/10/17 01:22:20 dang Exp $
+
+*gnome-applets-2.12.1-r2 (17 Oct 2005)
+
+  17 Oct 2005; <dang@gentoo.org>
+  +files/gnome-applets-2.12.1-volume-mute.patch,
+  +gnome-applets-2.12.1-r2.ebuild:
+  Fix spontaneous mute problems. Bug #108956
 
 *gnome-applets-2.12.1-r1 (12 Oct 2005)
 
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index c38f6e12187f..d5b5652e9c32 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,16 +1,19 @@
-MD5 859be0a7d42bbee51904ab93885199b9 gnome-applets-1.4.0.5.ebuild 1037
-MD5 f0f21c699a4e71e179115f815c3c80fa gnome-applets-2.10.1.ebuild 1741
-MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
-MD5 b5c7329982e8397e6f95455994ecec06 gnome-applets-2.6.2.ebuild 1570
-MD5 6624f3e55d16f759d7cf4079187427ec gnome-applets-2.12.1.ebuild 1818
-MD5 62bf724004b6320fab60e20a40395f15 gnome-applets-2.12.1-r1.ebuild 1970
 MD5 eda38c104207856042049273067a5cb6 ChangeLog 18668
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
 MD5 90c7825724b0c78966d8bbf5f401e9b8 files/digest-gnome-applets-2.10.0 74
 MD5 fa49e6f2df38c7035ec9671ffbc030de files/digest-gnome-applets-2.10.1 74
 MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1 74
 MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1-r1 74
-MD5 f7ba655004c33f5a85ce78bba4b818f4 files/gnome-applets-2.12.1-hal-switch.patch 772
+MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1-r2 74
+MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73
 MD5 ebcb8c6d8a9406b441de3e591d350960 files/gnome-applets-2.10.1-fbsd.patch 1494
-MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
+MD5 f7ba655004c33f5a85ce78bba4b818f4 files/gnome-applets-2.12.1-hal-switch.patch 772
+MD5 ed5d90f4b6499259a6bb64d87171272c files/gnome-applets-2.12.1-volume-mute.patch 2310
+MD5 859be0a7d42bbee51904ab93885199b9 gnome-applets-1.4.0.5.ebuild 1037
+MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
+MD5 f0f21c699a4e71e179115f815c3c80fa gnome-applets-2.10.1.ebuild 1741
+MD5 62bf724004b6320fab60e20a40395f15 gnome-applets-2.12.1-r1.ebuild 1970
+MD5 551e4d597370f9a85c76bdba55960429 gnome-applets-2.12.1-r2.ebuild 2050
+MD5 6624f3e55d16f759d7cf4079187427ec gnome-applets-2.12.1.ebuild 1818
+MD5 b5c7329982e8397e6f95455994ecec06 gnome-applets-2.6.2.ebuild 1570
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.12.1-r2 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.12.1-r2
new file mode 100644
index 000000000000..720dd9250fd2
--- /dev/null
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.12.1-r2
@@ -0,0 +1 @@
+MD5 06dd0b634d7092fa8af2ce302f68f912 gnome-applets-2.12.1.tar.bz2 5369404
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.12.1-volume-mute.patch b/gnome-base/gnome-applets/files/gnome-applets-2.12.1-volume-mute.patch
new file mode 100644
index 000000000000..8ac56894ece2
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.12.1-volume-mute.patch
@@ -0,0 +1,64 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-applets-2.12.1.orig/mixer/applet.c gnome-applets-2.12.1/mixer/applet.c
+--- gnome-applets-2.12.1.orig/mixer/applet.c	2005-10-03 21:02:17.000000000 -0400
++++ gnome-applets-2.12.1/mixer/applet.c	2005-10-16 19:19:43.000000000 -0400
+@@ -716,7 +716,7 @@
+       case GDK_SCROLL_UP:
+       case GDK_SCROLL_DOWN: {
+         GtkAdjustment *adj = gtk_range_get_adjustment (applet->dock->scale);
+-        gfloat volume = adj->value;
++        gdouble volume = adj->value;
+ 
+         if (event->direction == GDK_SCROLL_UP) {
+           volume += adj->step_increment;
+@@ -828,7 +828,7 @@
+     case GDK_Up:
+     case GDK_Down: {
+       GtkAdjustment *adj = gtk_range_get_adjustment (applet->dock->scale);
+-      gint volume = adj->value, increment;
++      gdouble volume = adj->value, increment;
+ 
+       if (event->keyval == GDK_Up || event->keyval == GDK_Down)
+         increment = adj->step_increment;
+@@ -942,10 +942,10 @@
+ void
+ gnome_volume_applet_adjust_volume (GstMixer *mixer,
+ 				   GstMixerTrack *track,
+-				   float volume)
++				   gdouble volume)
+ {
+   int range = track->max_volume - track->min_volume;
+-  float scale = ((float) range) / 100;
++  gdouble scale = ((gdouble) range) / 100;
+   int *volumes, n;
+ 
+   volume *= scale;
+@@ -953,7 +953,7 @@
+ 
+   volumes = g_new (gint, track->num_channels);
+   for (n = 0; n < track->num_channels; n++)
+-    volumes[n] = lrintf (volume);
++    volumes[n] = lrint (volume);
+   gst_mixer_set_volume (mixer, track, volumes);
+   g_free (volumes);
+ }
+@@ -990,7 +990,7 @@
+ {
+   GnomeVolumeApplet *applet = data;
+   gint *volumes, n;
+-  gfloat v;
++  gdouble v;
+   GList *iter;
+ 
+   if (applet->lock)
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-applets-2.12.1.orig/mixer/applet.h gnome-applets-2.12.1/mixer/applet.h
+--- gnome-applets-2.12.1.orig/mixer/applet.h	2005-10-03 21:02:17.000000000 -0400
++++ gnome-applets-2.12.1/mixer/applet.h	2005-10-16 19:19:07.000000000 -0400
+@@ -92,7 +92,7 @@
+ 
+ void     gnome_volume_applet_adjust_volume (GstMixer      *mixer,
+ 					    GstMixerTrack *track,
+-					    float          volume);
++					    gdouble        volume);
+ GType    gnome_volume_applet_get_type (void);
+ gboolean gnome_volume_applet_setup    (GnomeVolumeApplet *applet,
+ 				       GList             *elements);
diff --git a/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild
new file mode 100644
index 000000000000..9a1e9fdf4ef7
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild,v 1.1 2005/10/17 01:22:20 dang Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acpi apm hal ipv6"
+
+RDEPEND=">=x11-libs/gtk+-2.5
+	>=dev-libs/glib-2.5
+	>=gnome-base/libgnome-2.8
+	>=gnome-base/libgnomeui-2.8
+	>=gnome-base/gnome-vfs-2.8
+	>=gnome-base/gconf-2.8
+	>=gnome-base/gnome-panel-2.9.4
+	>=gnome-base/libgtop-2.11.92
+	>=gnome-base/libglade-2.4
+	>=gnome-base/gail-1.1
+	>=x11-libs/libxklavier-1.13
+	>=x11-libs/libwnck-2.9.3
+	>=app-admin/system-tools-backends-1.1.3
+	>=gnome-base/gnome-desktop-2.11.1
+	hal? ( >=sys-apps/hal-0.5.3
+		>=sys-apps/dbus-0.34 )
+	>=media-libs/gstreamer-0.8.2
+	>=gnome-extra/gucharmap-1.4
+	apm? ( sys-apps/apmd )
+	acpi? ( sys-power/acpid )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28
+	>=app-text/scrollkeeper-0.1.4
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--enable-flags \
+		$(use_enable ipv6)
+		$(use_with hal)"
+
+	if ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# add hal configure switch
+	epatch ${FILESDIR}/${P}-hal-switch.patch
+	# Fix volume-applet sometimes mutes
+	epatch ${FILESDIR}/${P}-volume-mute.patch
+
+	autoconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	for applet in \
+	accessx-status battstat charpick cpufreq drivemount geyes gkb-new  \
+	gswitchit gtik gweather mini-commander mixer modemlights multiload \
+	null_applet stickynotes trashapplet; do
+
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+
+	done
+}