summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-system-monitor/files
diff options
context:
space:
mode:
authoradamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059>2004-07-19 22:14:26 +0800
committeradamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059>2004-07-19 22:14:26 +0800
commit00e1e9870673ffebd65059afccc0d4c044d56fd2 (patch)
treefaddbf764a3662b92b29353be681b396b62881dd /sysutils/gnome-system-monitor/files
parent3a112471f48382d3d609e29627a6e780a77ab461 (diff)
downloadmarcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.tar
marcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.tar.gz
marcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.tar.bz2
marcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.tar.lz
marcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.tar.xz
marcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.tar.zst
marcuscom-ports-00e1e9870673ffebd65059afccc0d4c044d56fd2.zip
Add gnomesystemmonitor at 2.7.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2483 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-system-monitor/files')
-rw-r--r--sysutils/gnome-system-monitor/files/patch-configure20
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src::proctable.c55
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_util.c34
3 files changed, 109 insertions, 0 deletions
diff --git a/sysutils/gnome-system-monitor/files/patch-configure b/sysutils/gnome-system-monitor/files/patch-configure
new file mode 100644
index 000000000..504276306
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig Mon Nov 25 21:02:50 2002
++++ configure Fri Nov 29 20:30:44 2002
+@@ -3731,7 +3731,7 @@
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define GNOME_ICONDIR "${prefix}/share/pixmaps"
++#define GNOME_ICONDIR "${datadir}/pixmaps"
+ _ACEOF
+
+
+@@ -6630,7 +6630,7 @@
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
+-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
+ s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
+ s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
new file mode 100644
index 000000000..05f4c5384
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
@@ -0,0 +1,55 @@
+--- src/proctable.c.orig Mon Jul 19 10:02:09 2004
++++ src/proctable.c Mon Jul 19 10:08:18 2004
+@@ -563,6 +563,9 @@
+ glibtop_get_proc_uid (&procuid, pid);
+ glibtop_get_proc_time (&proctime, pid);
+ newcputime = proctime.utime + proctime.stime;
++ if (proctime.frequency) {
++ newcputime /= (proctime.frequency/100);
++ }
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
+
+ wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
+@@ -667,6 +670,10 @@
+ glibtop_get_proc_uid (&procuid, pid);
+ glibtop_get_proc_time (&proctime, pid);
+ newcputime = proctime.utime + proctime.stime;
++ if (proctime.frequency) {
++ newcputime /= (proctime.frequency/100);
++ }
++
+
+ wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
+ pid,
+@@ -761,6 +768,12 @@
+ return FALSE;
+ }
+
++static int
++pid_compare(const void* first, const void* second)
++{
++ return *(unsigned*)first - *(unsigned*)second;
++}
++
+ static void
+ refresh_list (ProcData *data, unsigned *pid_list, gint n)
+ {
+@@ -769,6 +782,8 @@
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
+ gint i = 0;
+
++ qsort(pid_list, n, sizeof (*pid_list), pid_compare);
++
+ /* Add or update processes */
+ while (i < n) {
+ ProcInfo *info;
+@@ -862,6 +877,9 @@
+ ** should probably have a total_time_last gint in the ProcInfo structure */
+ glibtop_get_cpu (&cpu);
+ total_time = cpu.total - total_time_last;
++ if (cpu.frequency) {
++ total_time /= (cpu.frequency/100);
++ }
+ total_time_last = cpu.total;
+
+ refresh_list (procdata, pid_list, n);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c
new file mode 100644
index 000000000..288ccc26a
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_util.c
@@ -0,0 +1,34 @@
+--- src/util.c.orig Fri Dec 12 02:26:57 2003
++++ src/util.c Fri Dec 12 02:35:38 2003
+@@ -16,6 +16,7 @@
+
+ #ifdef __FreeBSD__
+ # include <errno.h>
++# include <termios.h>
+ # include <libutil.h>
+ #endif
+
+@@ -181,7 +182,11 @@
+ * Make su think we're sending the password from a terminal:
+ */
+
++#ifndef __FreeBSD__
+ if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
++#else
++ if ((t_fd = OPEN_TTY()) < 0) {
++#endif
+ fprintf (stderr, "Unable to open a terminal\n");
+ ABORT (root);
+ }
+@@ -259,7 +264,11 @@
+ }
+ }
+
++#ifndef __FreeBSD__
+ if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
++#else
++ if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
++#endif
+ perror ("Unable to open pseudo slave terminal");
+ _exit (-1);
+ }