cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove patches that aren't needed anymore after recent libgtop2 changes

Browse Source 
* note the memory display may change a bit, but that's expected as this
doesn't try to mimic top(1) behaviour (anymore).
- tighten dependeny on libgtop2

ok aja@
This commit is contained in:
jasper 2011-07-10 14:46:50 +00:00
parent ac95a9e7ff
commit ade9e7b5e4
4 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gnome/system-monitor/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2011/05/26 07:29:34 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2011/07/10 14:46:50 jasper Exp $
COMMENT= sytem monitor for GNOME
GNOME_PROJECT= gnome-system-monitor
GNOME_VERSION= 2.28.2
REVISION= 5
REVISION= 6
CATEGORIES= sysutils
@ -33,7 +33,7 @@ MODULES= devel/gettext \
RUN_DEPENDS= x11/gnome/icon-theme
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= x11/gtk2mm \
devel/libgtop2>=2.28.1p8 \
devel/libgtop2>=2.28.3p23 \
devel/startup-notification \
devel/pango \
devel/libwnck \

24
x11/gnome/system-monitor/patches/patch-src_load-graph_cpp
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_load-graph_cpp,v 1.2 2011/05/26 07:31:01 jasper Exp $
It's much more intuitive for the user to see the memory usage values
aligning with the familiar information presented by top(1).
XXX: When gtop2's mem.cached is implemented,
adjust mem.user and remove this patch.
--- src/load-graph.cpp.orig Tue Sep 28 01:13:17 2010
+++ src/load-graph.cpp Wed May 25 12:03:52 2011
@@ -360,11 +360,11 @@ get_memory (LoadGraph *g)
/* There's no swap on LiveCD : 0.0f is better than NaN :) */
swappercent = (swap.total ? (float)swap.used / (float)swap.total : 0.0f);
- mempercent = (float)mem.user / (float)mem.total;
+ mempercent = (float)mem.used / (float)mem.total;
set_memory_label_and_picker(GTK_LABEL(g->labels.memory),
GSM_COLOR_BUTTON(g->mem_color_picker),
- mem.user, mem.total, mempercent);
+ mem.used, mem.total, mempercent);
set_memory_label_and_picker(GTK_LABEL(g->labels.swap),
GSM_COLOR_BUTTON(g->swap_color_picker),

6
x11/gnome3/x11/gnome/system-monitor/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2011/06/14 21:56:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2011/07/10 14:46:50 jasper Exp $
COMMENT= sytem monitor for GNOME
GNOME_PROJECT= gnome-system-monitor
GNOME_VERSION= 3.0.1
REVISION= 1
REVISION= 2
CATEGORIES= sysutils
@ -32,7 +32,7 @@ MODULES= devel/dconf \
RUN_DEPENDS= x11/gnome/icon-theme
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= devel/libgtop2>=2.28.1p8 \
LIB_DEPENDS= devel/libgtop2>=2.28.3p23 \
devel/libwnck3 \
x11/gnome/librsvg \
x11/gtk3mm

24
x11/gnome3/x11/gnome/system-monitor/patches/patch-src_load-graph_cpp
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_load-graph_cpp,v 1.1.1.1 2011/06/07 13:31:39 jasper Exp $
It's much more intuitive for the user to see the memory usage values
aligning with the familiar information presented by top(1).
XXX: When gtop2's mem.cached is implemented,
adjust mem.user and remove this patch.
--- src/load-graph.cpp.orig Mon May 23 22:57:24 2011
+++ src/load-graph.cpp Tue Jun 7 11:45:42 2011
@@ -353,11 +353,11 @@ get_memory (LoadGraph *g)
/* There's no swap on LiveCD : 0.0f is better than NaN :) */
swappercent = (swap.total ? (float)swap.used / (float)swap.total : 0.0f);
- mempercent = (float)mem.user / (float)mem.total;
+ mempercent = (float)mem.used / (float)mem.total;
set_memory_label_and_picker(GTK_LABEL(g->labels.memory),
GSM_COLOR_BUTTON(g->mem_color_picker),
- mem.user, mem.total, mempercent);
+ mem.used, mem.total, mempercent);
set_memory_label_and_picker(GTK_LABEL(g->labels.swap),
GSM_COLOR_BUTTON(g->swap_color_picker),