From e09a6b864556536aba6584ef50e899cc9bec544d Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 18 Dec 2006 02:24:27 +0000 Subject: Update to 2.17.4, now completely written in C++ (ugh). git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8052 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-system-monitor/Makefile | 4 +-- sysutils/gnome-system-monitor/distinfo | 6 ++-- .../files/patch-src::proctable.c | 33 ---------------------- .../files/patch-src_interface.cpp | 14 +++++++++ .../files/patch-src_openfiles.c | 10 ------- .../files/patch-src_openfiles.cpp | 10 +++++++ .../files/patch-src_proctable.cpp | 33 ++++++++++++++++++++++ .../files/patch-src_sysinfo.cpp | 17 ++++------- 8 files changed, 68 insertions(+), 59 deletions(-) delete mode 100644 sysutils/gnome-system-monitor/files/patch-src::proctable.c create mode 100644 sysutils/gnome-system-monitor/files/patch-src_interface.cpp delete mode 100644 sysutils/gnome-system-monitor/files/patch-src_openfiles.c create mode 100644 sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp create mode 100644 sysutils/gnome-system-monitor/files/patch-src_proctable.cpp (limited to 'sysutils') diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 1acf73206..e7ccadeaa 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.79 2006/11/24 08:03:19 marcus Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.80 2006/12/04 18:42:20 marcus Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.17.3 +PORTVERSION= 2.17.4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index adc6c8a44..9ebab52fc 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = af2f3d794768b52df5c737b9aadcc9d8 -SHA256 (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = 50fd90d2bba4ef3a5d3549aa1f6edf767ff1476c3f98f31ea1598ec99db5fa5e -SIZE (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = 1483250 +MD5 (gnome2/gnome-system-monitor-2.17.4.tar.bz2) = d0af976830b7e40bfcc00297da4a46ab +SHA256 (gnome2/gnome-system-monitor-2.17.4.tar.bz2) = 95b30914883afb50ab17c45b034ddced5edf789726b31f7697f196f9eb416097 +SIZE (gnome2/gnome-system-monitor-2.17.4.tar.bz2) = 1483906 diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c deleted file mode 100644 index 0d9940650..000000000 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ /dev/null @@ -1,33 +0,0 @@ ---- src/proctable.c.orig Wed Aug 30 14:11:01 2006 -+++ src/proctable.c Tue Oct 24 13:39:29 2006 -@@ -923,6 +923,12 @@ static void cb_exclude(ProcInfo* info, G - } - - -+static int -+pid_compare(const void* first, const void* second) -+{ -+ return *(unsigned*)first - *(unsigned*)second; -+} -+ - static void - refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) - { -@@ -1015,10 +1021,16 @@ proctable_update_list (ProcData * const - - pid_list = glibtop_get_proclist (&proclist, which, arg); - -+ qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare); -+ - /* FIXME: total cpu time elapsed should be calculated on an individual basis here - ** should probably have a total_time_last gint in the ProcInfo structure */ - glibtop_get_cpu (&cpu); -- total_time = MAX(cpu.total - total_time_last, 1); -+ total_time = cpu.total - total_time_last; -+ if (cpu.frequency) { -+ total_time /= (cpu.frequency/100); -+ } -+ total_time = MAX(total_time, 1); - total_time_last = cpu.total; - - refresh_list (procdata, pid_list, proclist.number); diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.cpp b/sysutils/gnome-system-monitor/files/patch-src_interface.cpp new file mode 100644 index 000000000..e7a0dc05a --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_interface.cpp @@ -0,0 +1,14 @@ +--- src/interface.cpp.orig Sun Dec 17 21:19:35 2006 ++++ src/interface.cpp Sun Dec 17 21:21:53 2006 +@@ -654,9 +654,9 @@ disconnect_proxy_cb (GtkUIManager *manag + { + if (GTK_IS_MENU_ITEM (proxy)) { + g_signal_handlers_disconnect_by_func +- (proxy, reinterpret_cast(G_CALLBACK(menu_item_select_cb)), procdata); ++ (proxy, (void *) (G_CALLBACK(menu_item_select_cb)), procdata); + g_signal_handlers_disconnect_by_func +- (proxy, reinterpret_cast(G_CALLBACK(menu_item_deselect_cb)), procdata); ++ (proxy, (void *) (G_CALLBACK(menu_item_deselect_cb)), procdata); + } + } + diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c deleted file mode 100644 index 971e718b2..000000000 --- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/openfiles.c.orig Mon Apr 11 03:50:49 2005 -+++ src/openfiles.c Mon Apr 11 03:52:13 2005 -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include "procman.h" - #include "openfiles.h" diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp new file mode 100644 index 000000000..3732177fd --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp @@ -0,0 +1,10 @@ +--- src/openfiles.cpp.orig Mon Apr 11 03:50:49 2005 ++++ src/openfiles.cpp Mon Apr 11 03:52:13 2005 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include "procman.h" + #include "openfiles.h" diff --git a/sysutils/gnome-system-monitor/files/patch-src_proctable.cpp b/sysutils/gnome-system-monitor/files/patch-src_proctable.cpp new file mode 100644 index 000000000..a34f18164 --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_proctable.cpp @@ -0,0 +1,33 @@ +--- src/proctable.cpp.orig Wed Aug 30 14:11:01 2006 ++++ src/proctable.cpp Tue Oct 24 13:39:29 2006 +@@ -923,6 +923,12 @@ static void cb_exclude(ProcInfo* info, G + } + + ++static int ++pid_compare(const void* first, const void* second) ++{ ++ return *(unsigned*)first - *(unsigned*)second; ++} ++ + static void + refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) + { +@@ -1015,10 +1021,16 @@ proctable_update_list (ProcData * const + + pid_list = glibtop_get_proclist (&proclist, which, arg); + ++ qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare); ++ + /* FIXME: total cpu time elapsed should be calculated on an individual basis here + ** should probably have a total_time_last gint in the ProcInfo structure */ + glibtop_get_cpu (&cpu); +- total_time = MAX(cpu.total - total_time_last, 1); ++ total_time = cpu.total - total_time_last; ++ if (cpu.frequency) { ++ total_time /= (cpu.frequency/100); ++ } ++ total_time = MAX(total_time, 1); + total_time_last = cpu.total; + + refresh_list (procdata, pid_list, proclist.number); diff --git a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp index 7af65a835..eef9c6eca 100644 --- a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp +++ b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp @@ -1,21 +1,16 @@ ---- src/sysinfo.cpp.orig Mon Nov 20 15:41:52 2006 -+++ src/sysinfo.cpp Mon Dec 4 13:39:52 2006 -@@ -8,9 +8,14 @@ - #include - #include - -+#include -+#include - #include +--- src/sysinfo.cpp.orig Thu Dec 14 17:51:28 2006 ++++ src/sysinfo.cpp Sun Dec 17 21:17:34 2006 +@@ -12,6 +12,9 @@ #include #include + #include +#ifdef __FreeBSD__ +#include +#endif #include #include -@@ -191,6 +196,29 @@ namespace { +@@ -190,6 +193,29 @@ namespace { } }; @@ -45,7 +40,7 @@ SysInfo* get_sysinfo() { -@@ -198,8 +226,11 @@ namespace { +@@ -197,8 +223,11 @@ namespace { g_free(p); return new LSBSysInfo; } -- cgit v1.2.3