Adding patch to remove buffers+cache from the memory graph. Closes bug 75207

5 files changed, 78 insertions, 17 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index b2cef1d6e868..ab56465c653f 100644
--- a/gnome-extra/gnome-system-monitor/ChangeLog
+++ b/gnome-extra/gnome-system-monitor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-system-monitor
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.56 2004/12/24 00:32:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.57 2004/12/24 15:39:50 joem Exp $
+
+*gnome-system-monitor-2.8.1-r1 (24 Dec 2004)
+
+  24 Dec 2004; Joe McCann <joem@gentoo.org>
+  +files/gnome-system-monitor-2.8.0-usermem.patch,
+  +gnome-system-monitor-2.8.1-r1.ebuild:
+  Adding patch to remove buffers+cache from the memory graph. Closes bug 75207
 
   24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   gnome-system-monitor-2.8.0.ebuild:
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index f7d256f1d7e4..0dfaca0e3b09 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 676d08f8c1e94b9e140de9b0ca502e20 gnome-system-monitor-2.7.0-r1.ebuild 904
-MD5 13f30c082138a6575b5aaea9d586ce10 ChangeLog 7305
+MD5 0c299594f2298bc18c00d22305126735 gnome-system-monitor-2.4.0.ebuild 893
 MD5 de6e9fbc941d9b5fad86d7d17d335bba gnome-system-monitor-2.6.0.ebuild 758
+MD5 676d08f8c1e94b9e140de9b0ca502e20 gnome-system-monitor-2.7.0-r1.ebuild 904
 MD5 f57f7ad9026f2b4d04f087611d97511b gnome-system-monitor-2.8.0.ebuild 893
-MD5 0c299594f2298bc18c00d22305126735 gnome-system-monitor-2.4.0.ebuild 893
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 82eb4cebe4d26878291e479f025b045a ChangeLog 7565
 MD5 f1d83ce1f957f360791c659000de4dc6 gnome-system-monitor-2.8.1.ebuild 923
+MD5 dc6c2b5b010aa9ebb4d8d5bdaf9d34c3 gnome-system-monitor-2.8.1-r1.ebuild 1030
+MD5 dd79207af7cf6082732128db4d74c083 files/digest-gnome-system-monitor-2.4.0 79
 MD5 944c4f8bbb9ce7f3a74df3f85d3dc4ac files/digest-gnome-system-monitor-2.6.0 79
-MD5 f63333f7df598d3202491c069b5f6a99 files/gnome-system-monitor-2.4.0-fix_gtk+-2.4_build.patch 1173
 MD5 a154a9f86e926ea00a0779b875cebc67 files/digest-gnome-system-monitor-2.7.0-r1 79
+MD5 67bd440a0a6bbd96815b8a68d623ea28 files/digest-gnome-system-monitor-2.8.0 79
+MD5 f63333f7df598d3202491c069b5f6a99 files/gnome-system-monitor-2.4.0-fix_gtk+-2.4_build.patch 1173
 MD5 b39b1d001c6cfb36a860351aed50ddb3 files/gnome-system-monitor-devicesviewimprovements.patch 20935
 MD5 9948d4c847a49ac1a9db168f46c0d376 files/gnome-system-monitor-execlp.patch 365
-MD5 67bd440a0a6bbd96815b8a68d623ea28 files/digest-gnome-system-monitor-2.8.0 79
-MD5 dd79207af7cf6082732128db4d74c083 files/digest-gnome-system-monitor-2.4.0 79
 MD5 998687db7f5ab05119833a0131a25b11 files/digest-gnome-system-monitor-2.8.1 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBy2OXugEuf3OQ0akRAuLsAJ9tOOPudCTgv5IoOg4Xcm7CBG2crQCeN2DY
-gbwKcy0HZH4h+wT90wZBapY=
-=IIFm
------END PGP SIGNATURE-----
+MD5 998687db7f5ab05119833a0131a25b11 files/digest-gnome-system-monitor-2.8.1-r1 79
+MD5 cb821d6a95343091a60060f653b8ae00 files/gnome-system-monitor-2.8.1-usermem.patch 889
diff --git a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.1-r1 b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.1-r1
new file mode 100644
index 000000000000..c6588bbca8d6
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.1-r1
@@ -0,0 +1 @@
+MD5 b76c5a70689a704981e1a501f0b3165b gnome-system-monitor-2.8.1.tar.bz2 666862
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.8.1-usermem.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.8.1-usermem.patch
new file mode 100644
index 000000000000..1f96a03d74f4
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.8.1-usermem.patch
@@ -0,0 +1,20 @@
+===================================================================
+RCS file: /cvs/gnome/procman/src/load-graph.c,v
+retrieving revision 1.33
+retrieving revision 1.33.2.1
+diff -u -r1.33 -r1.33.2.1
+--- procman/src/load-graph.c	2004/11/12 08:20:07	1.33
++++ procman/src/load-graph.c	2004/12/24 14:33:10	1.33.2.1
+@@ -200,10 +200,10 @@
+ 	glibtop_get_swap (&swap);
+ 
+ 	swappercent = (float)swap.used / (float)swap.total;
+-	mempercent  = (float)mem.used  / (float)mem.total;
++	mempercent  = (float)mem.user  / (float)mem.total;
+ 
+ 	text1 = gnome_vfs_format_file_size_for_display (mem.total);
+-	text2 = gnome_vfs_format_file_size_for_display (mem.used);
++	text2 = gnome_vfs_format_file_size_for_display (mem.user);
+ 	text3 = g_strdup_printf ("  %.1f %%", mempercent * 100.0f);
+ 	gtk_label_set_text (GTK_LABEL (g->memused_label), text2);
+ 	gtk_label_set_text (GTK_LABEL (g->memtotal_label), text1);
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.1-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..a0abd84c107c
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.1-r1.ebuild,v 1.1 2004/12/24 15:39:50 joem Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE=""
+
+RDEPEND=">=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-2
+	>=x11-libs/libwnck-2.5
+	>=gnome-base/libgtop-2.8
+	>=x11-libs/gtk+-2.3
+	>=gnome-base/gnome-vfs-2.6"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/intltool-0.29
+	${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog HACKING README NEWS TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# fix the "can't kill an un-owned process bug,
+	# see bug #17880
+	epatch ${FILESDIR}/${PN}-execlp.patch
+	# don't show buffer + cached memory in graph
+	# see bug #75207
+	epatch ${FILESDIR}/${P}-usermem.patch
+}
+