diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2004-05-15 15:49:17 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2004-05-15 15:49:17 +0000 |
commit | 6f316ce2e89f972a4f22e1b97e1dda5e9d58cefa (patch) | |
tree | fb8d61358190cc429db453d54fb9920ccfde716f /sysutils/gnome-system-monitor/files | |
parent | ea16706c62b542adc8f3b887256bf215bf914db6 (diff) |
Diffstat (limited to 'sysutils/gnome-system-monitor/files')
-rw-r--r-- | sysutils/gnome-system-monitor/files/patch-configure | 20 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/files/patch-src::proctable.c | 53 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/files/patch-src_util.c | 34 |
3 files changed, 0 insertions, 107 deletions
diff --git a/sysutils/gnome-system-monitor/files/patch-configure b/sysutils/gnome-system-monitor/files/patch-configure deleted file mode 100644 index 504276306bba..000000000000 --- a/sysutils/gnome-system-monitor/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index fda683104a47..000000000000 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ /dev/null @@ -1,53 +0,0 @@ ---- src/proctable.c.orig Sun Feb 8 10:06:08 2004 -+++ src/proctable.c Tue Apr 13 01:01:51 2004 -@@ -547,6 +548,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 ()), -@@ -651,6 +655,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); -+ } - - wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), - pid, -@@ -751,12 +758,20 @@ - return NULL; - } - -+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) - { - ProcData *procdata = data; - GList *list = procdata->info; - gint i = 0; -+ -+ qsort(pid_list, n, sizeof (*pid_list), pid_compare); - - while (i < n) - { -@@ -848,6 +863,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 deleted file mode 100644 index 288ccc26adc0..000000000000 --- a/sysutils/gnome-system-monitor/files/patch-src_util.c +++ /dev/null @@ -1,34 +0,0 @@ ---- 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); - } |