diff options
Diffstat (limited to 'gnome-base/gnome-applets')
6 files changed, 9 insertions, 120 deletions
diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog index 69c3d2db1aa0..cb19b486d79b 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 Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.83 2004/11/25 03:25:54 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.84 2004/11/25 03:30:30 obz Exp $ + + 25 Nov 2004; Mike Gardiner <obz@gentoo.org> + -files/gnome-applets-2.4.1-multiload_mem_fix.patch, + -files/gnome-applets-2.6.0-battstat.patch, + -files/gnome-applets-2.6.0-fix_alsa_mixer.patch, + -files/gnome-applets-2.6.0-weather_icon_fix.patch: + Removed unused patches *gnome-applets-2.8.1.1 (25 Nov 2004) diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index ab11e8fddf20..042618e1a10f 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -3,15 +3,11 @@ MD5 33728e67b13b961afc2ba6e3f326337c gnome-applets-2.8.0.ebuild 1511 MD5 1ddad64fc308e3113f23314ec30ab6b6 gnome-applets-2.8.1.1.ebuild 1519 MD5 c96112b5aef8652390decd20d7b6bdbc gnome-applets-2.4.2.ebuild 1368 MD5 65827c848d17491fc336b172e0ac34fb gnome-applets-2.6.2.ebuild 1512 -MD5 e1fb56e21bb6d1f2583cd740ca197e94 ChangeLog 11721 +MD5 06e0ef8ed82a2ebd057eaea88c2b37e7 ChangeLog 11996 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 73 MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73 MD5 0d439ec9ec7142ba8d655023e51280cc files/digest-gnome-applets-2.8.0 73 MD5 c1487665ce1566df5b58ca7a838cb850 files/digest-gnome-applets-2.8.1.1 75 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 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/gnome-applets-2.4.1-multiload_mem_fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.4.1-multiload_mem_fix.patch deleted file mode 100644 index 54c46e351f13..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.4.1-multiload_mem_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gnome-applets-2.4.1.orig/multiload/linux-proc.c 2003-11-29 16:32:44.863168560 +0100 -+++ gnome-applets-2.4.1/multiload/linux-proc.c 2003-11-29 16:35:46.429566272 +0100 -@@ -130,7 +130,6 @@ - GetMemory (int Maximum, int data [5], LoadGraph *g) - { - int user, shared, buffer, cached; -- unsigned long tmp_user; - - glibtop_mem mem; - -@@ -138,9 +137,7 @@ - - assert ((mem.flags & needed_mem_flags) == needed_mem_flags); - -- tmp_user = mem.used - mem.buffer - mem.shared - mem.cached; -- -- user = rint (Maximum * (float)tmp_user / mem.total); -+ user = rint (Maximum * (float)mem.user / mem.total); - shared = rint (Maximum * (float)mem.shared / mem.total); - buffer = rint (Maximum * (float)mem.buffer / mem.total); - cached = rint (Maximum * (float)mem.cached / mem.total); diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-battstat.patch b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-battstat.patch deleted file mode 100644 index 302f8da909f0..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-battstat.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ruN gnome-applets-2.6.0.orig/configure gnome-applets-2.6.0/configure ---- gnome-applets-2.6.0.orig/configure 2004-04-05 00:42:13.075488632 +0200 -+++ gnome-applets-2.6.0/configure 2004-04-05 18:18:27.738075488 +0200 -@@ -24147,8 +24147,6 @@ - NEED_LIBAPM=no - build_battstat_applet=yes - case "${host}" in -- powerpc-*-linux*) -- ;; - # list of supported OS cores that use libapm - *-*-linux*) - NEED_LIBAPM=yes -diff -ruN gnome-applets-2.6.0.orig/configure.in gnome-applets-2.6.0/configure.in ---- gnome-applets-2.6.0.orig/configure.in 2004-04-05 00:42:10.972808288 +0200 -+++ gnome-applets-2.6.0/configure.in 2004-04-05 18:18:13.551232216 +0200 -@@ -208,8 +208,9 @@ - NEED_LIBAPM=no - build_battstat_applet=yes - case "${host}" in -- powerpc-*-linux*) -- ;; -+# linux powerpc has apm emulation. -+# powerpc-*-linux*) -+# ;; - # list of supported OS cores that use libapm - *-*-linux*) - NEED_LIBAPM=yes 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 deleted file mode 100644 index fd32ab47b2da..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-fix_alsa_mixer.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ../../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 deleted file mode 100644 index 9e64da9acc73..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-weather_icon_fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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")) { |