fix multiload mem display bug

5 files changed, 49 insertions, 17 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 92dada0a395e..819a6c2781bb 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.45 2003/11/28 13:30:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.46 2003/12/02 15:33:26 foser Exp $
+
+*gnome-applets-2.4.1-r2 (02 Dec 2003)
+
+  02 Dec 2003; foser <foser@gentoo.org> gnome-applets-2.4.1-r2.ebuild :
+  Add patch to fix problems with multiload memory display and 2.6 kernels (#34701)
 
   28 Nov 2003; Ciaran McCreesh <ciaranm@gentoo.org>
   gnome-applets-2.4.0.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 9c5a2211f7b2..650aa4de5f5b 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,20 +1,18 @@
 MD5 e90af807ba95982450dedc5a96ca7cc0 gnome-applets-1.4.0.5.ebuild 1030
 MD5 cd2e8f7aa5d7e4d14d35d232054864bf gnome-applets-2.4.0.ebuild 1387
 MD5 591e9abb00d08de66449941caeedd9e7 gnome-applets-2.2.1.ebuild 1985
-MD5 ecf88470d739e3163d870b947a2340f8 gnome-applets-2.4.1-r2.ebuild 1649
+MD5 1c9bb3ce901b79448eee3455d0489189 gnome-applets-2.4.1-r2.ebuild 1656
 MD5 cec0d5f815e959d16042dea4c16fa795 gnome-applets-2.2.0.ebuild 2336
 MD5 9e5ca0fec93872f83b2c08e4b23e3429 gnome-applets-2.4.1-r1.ebuild 1586
-MD5 5d99a35ded72548ebd94160d6cef35d2 gnome-applets-2.4.1.ebuild 1393
 MD5 0daca6b4fb4440032f2897e24473ee6b gnome-applets-2.2.2.ebuild 1897
-MD5 88c21c20efa312dc59177eea097676d6 ChangeLog 6637
+MD5 f2d184c094cd7b63e8b784fe4b0b3725 ChangeLog 6830
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 570394d774d255e844fb7829cec973f3 files/digest-gnome-applets-2.2.0 73
 MD5 9cdac911e9aef7c9e0b4bfe91bcc6b2b files/digest-gnome-applets-2.2.1 73
 MD5 65f479a92b6154db11799a0303940c63 files/digest-gnome-applets-2.2.2 73
 MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
-MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1 73
 MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r1 73
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r2 73
-MD5 a9b5983191ff9b416728695c7b280515 files/gnome-applets-2.4.1-multiload_mem_fix.patch 22583
+MD5 10b40dca343dcbf0feee84fd964a0fe3 files/gnome-applets-2.4.1-multiload_mem_fix.patch 813
 MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r2
index 52ec7ed75110..52ec7ed75110 100644
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r2
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
new file mode 100644
index 000000000000..54c46e351f13
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.4.1-multiload_mem_fix.patch
@@ -0,0 +1,21 @@
+--- 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/gnome-applets-2.4.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
index 6062b22888dd..e29bea13f8eb 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.4.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 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.4.1.ebuild,v 1.1 2003/09/24 16:25:23 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild,v 1.1 2003/12/02 15:33:26 foser Exp $
 
 inherit gnome2
 
 DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
 
-IUSE="doc apm ipv6"
+IUSE="doc apm acpi ipv6"
 SLOT="2"
 LICENSE="GPL-2 FDL-1.1"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
@@ -22,7 +22,8 @@ RDEPEND=">=x11-libs/gtk+-2.1
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	virtual/x11
-	apm? ( sys-apps/apmd )"
+	apm? ( sys-apps/apmd )
+	acpi? ( sys-apps/acpid )"
 	# Virtual/x11 for XKB.h 
 
 DEPEND="${RDEPEND}
@@ -31,23 +32,30 @@ DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README"
+G2CONF="${G2CONF} $(use_enable ipv6)"
 
 src_unpack() {
-
 	unpack ${A}
 
-	cd ${S}
-	gnome2_omf_fix
+	# http://bugzilla.gnome.org/show_bug.cgi?id=88553
+	# http://www.its.caltech.edu/~dmoore/battstat/
+	if [ -n "`use acpi`" ]; then
+		EPATCH_OPTS="-d ${S}/battstat"
+		epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff
+	fi
 
+	#
+	cd ${S}/multiload
+	epatch ${FILESDIR}/${P}-multiload_mem_fix.patch
+
+	gnome2_omf_fix
 }
 
-src_install () {
-	use ipv6 \
-		&& G2CONF="${G2CONF} --enable-ipv6" \
-		|| G2CONF="${G2CONF} --disable-ipv6"
 
+
+src_install () {
 	gnome2_src_install
-	for BLERHG in accessx-status battstat cdplayer charpick drivemount geyes gkb-new gtik gweather mailcheck mini-commander mixer modemlights multiload  screen-exec  stickynotes wireless; do
+	for BLERHG  in accessx-status battstat cdplayer charpick drivemount geyes gkb-new gtik gweather mailcheck mini-commander mixer modemlights multiload screen-exec stickynotes wireless; do
 			docinto ${BLERHG}
 			dodoc ${BLERHG}/[ChangeLog,AUTHORS,NEWS,TODO] ${BLERHG}/README*
 	done