add 2 minor patches & bump rev

6 files changed, 86 insertions, 2 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index b0b7542bb8f9..4f1472575140 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.63 2004/05/14 03:15:38 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.64 2004/05/20 22:43:06 foser Exp $
+
+*gnome-applets-2.0.6-r1 (21 May 2004)
+
+  21 May 2004; foser <foser@gentoo.org> gnome-applets-2.6.0-r1.ebuild :
+  Add patches for weather icon bug (#46839)
+  Fix for mixer applet with alsa bug (#50770)
+  provided by Travis Snoozy <ai2097@yahoo.com> 
 
   13 May 2004; Stephen P. Becker <geoman@gentoo.org>
   gnome-applets-2.4.2.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 0ab99635f280..1eabf02c47d8 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -2,6 +2,7 @@ MD5 e3f58a4e977c48032ddff3d56d8c31d8 gnome-applets-1.4.0.5.ebuild 1034
 MD5 bb982dce3b7137ff6af111cf0072ec34 gnome-applets-2.4.0.ebuild 1386
 MD5 0d2910338b8be3d3aec080ca2a943730 gnome-applets-2.4.1-r2.ebuild 1670
 MD5 b96ee7081cc97052c1e3501e689755b2 gnome-applets-2.4.2.ebuild 1374
+MD5 c56a08276217a182a1dde30cb0cd9b61 gnome-applets-2.6.0-r1.ebuild 1750
 MD5 61fceac943c8dc8507ab81b299b82c78 gnome-applets-2.6.0.ebuild 1571
 MD5 ba340ef9a1ba4d8b7670b3a5130a8110 gnome-applets-2.4.1-r1.ebuild 1605
 MD5 aa7661ad909e6eb2b3d2a27eb26ed627 ChangeLog 9152
@@ -10,8 +11,11 @@ MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
 MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 73
 MD5 e6c0361579fce4e995585cbb9aa6c99f files/digest-gnome-applets-2.6.0 73
 MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
+MD5 60c44a10d7f6c05ff73a9e70a859e812 files/gnome-applets-2.6.0-weather_icon_fix.patch 1258
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r1 73
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r2 73
+MD5 e6c0361579fce4e995585cbb9aa6c99f files/digest-gnome-applets-2.6.0-r1 73
+MD5 ca22b51f614faf66be721c994ca4783f files/gnome-applets-2.6.0-fix_alsa_mixer.patch 801
 MD5 10b40dca343dcbf0feee84fd964a0fe3 files/gnome-applets-2.4.1-multiload_mem_fix.patch 813
 MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
 MD5 62eb963d0b1badb3016ce37a1afc4000 files/gnome-applets-2.6.0-battstat.patch 898
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0-r1
index ce664e943708..ce664e943708 100644
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0-r1
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-fix_alsa_mixer.patch b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-fix_alsa_mixer.patch
new file mode 100644
index 000000000000..fd32ab47b2da
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-fix_alsa_mixer.patch
@@ -0,0 +1,31 @@
+--- ../../gnome-applets-2.6.0/mixer/mixer.c	2004-02-28 11:55:09.000000000 -0800
++++ mixer.c	2004-05-11 08:07:04.384547736 -0700
+@@ -238,7 +238,7 @@
+ 	t = (vol - track->min_volume) /
+ 		(double) (track->max_volume - track->min_volume);
+ 
+-	return (gint) (VOLUME_MAX * t);
++	return (gint) rint((VOLUME_MAX * t));
+ }
+ 
+ /*
+@@ -255,8 +255,8 @@
+ 
+ 	t = vol / (double) VOLUME_MAX;
+ 	
+-	return (gint) (t * (track->max_volume - track->min_volume)
+-		       + track->min_volume);
++	return (gint) rint((t * (track->max_volume - track->min_volume)
++		       + track->min_volume));
+ }
+ 
+ static int
+@@ -280,7 +280,7 @@
+ 	
+ 	vol /= cdata->track->num_channels;
+ 
+-	return gstreamer_normalize_volume (cdata->track, (gint) vol);
++	return gstreamer_normalize_volume (cdata->track, (gint) rint(vol));
+ }
+ 
+ static void
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-weather_icon_fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-weather_icon_fix.patch
new file mode 100644
index 000000000000..9e64da9acc73
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-weather_icon_fix.patch
@@ -0,0 +1,35 @@
+--- gweather/weather.c.orig	2004-03-14 21:47:40.000000000 +0100
++++ gweather/weather.c	2004-03-29 10:15:48.000000000 +0200
+@@ -298,7 +298,7 @@
+ #define TIME_RE_STR  "^([0-9]{6})Z$"
+ #define WIND_RE_STR  "^(([0-9]{3})|VRB)([0-9]?[0-9]{2})(G[0-9]?[0-9]{2})?KT$"
+ #define VIS_RE_STR   "^(([0-9]?[0-9])|(M?1/[0-9]?[0-9]))SM$"
+-#define CLOUD_RE_STR "^(CLR|BKN|SCT|FEW|OVC)([0-9]{3})?$"
++#define CLOUD_RE_STR "^(CLR|BKN|SCT|FEW|OVC|SKC)([0-9]{3})?$"
+ #define TEMP_RE_STR  "^(M?[0-9][0-9])/(M?(//|[0-9][0-9]))$"
+ #define PRES_RE_STR  "^(A|Q)([0-9]{4})$"
+ #define COND_RE_STR  "^(-|\\+)?(VC|MI|BC|PR|TS|BL|SH|DR|FZ)?(DZ|RA|SN|SG|IC|PE|GR|GS|UP|BR|FG|FU|VA|SA|HZ|PY|DU|SQ|SS|DS|PO|\\+?FC)$"
+@@ -526,7 +526,13 @@
+     gint alt = -1;
+ 
+     if (regexec(&metar_re[CLOUD_RE], tokp, 0, NULL, 0) == REG_NOMATCH)
+-        return FALSE;
++	if (!strcmp(tokp,"CAVOK"))
++	{
++		info->sky=SKY_CLEAR;
++		return TRUE;
++	}
++   	else
++        	return FALSE;
+ 
+     strncpy(stype, tokp, 3);
+     stype[3] = 0;
+@@ -538,6 +544,8 @@
+ 
+     if (!strcmp(stype, "CLR")) {
+         info->sky = SKY_CLEAR;
++    } else if (!strcmp(stype, "SKC")) {
++        info->sky = SKY_CLEAR;
+     } else if (!strcmp(stype, "BKN")) {
+         info->sky = SKY_BROKEN;
+     } else if (!strcmp(stype, "SCT")) {
diff --git a/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.6.0-r1.ebuild
index 238cb442d9eb..0fe880b4bf2f 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.6.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/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild,v 1.3 2004/04/27 21:09:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.6.0-r1.ebuild,v 1.1 2004/05/20 22:43:06 foser Exp $
 
 inherit gnome2 eutils
 
@@ -43,6 +43,13 @@ src_unpack() {
 
 	gnome2_omf_fix
 	epatch ${FILESDIR}/gnome-applets-2.6.0-battstat.patch
+
+	cd ${S}
+	# fix weather reporting (#46389)
+	epatch ${FILESDIR}/${P}-weather_icon_fix.patch
+	# fix problem with alsa volume control (#50770)
+	epatch ${FILESDIR}/${P}-fix_alsa_mixer.patch
+
 }
 
 src_install () {