Hello community,
here is the log from the commit of package gnome-system-monitor
checked in at Tue Jun 6 22:23:22 CEST 2006.
--------
--- GNOME/gnome-system-monitor/gnome-system-monitor.changes 2006-05-22 17:36:09.000000000 +0200
+++ gnome-system-monitor/gnome-system-monitor.changes 2006-06-06 22:08:20.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 6 22:06:02 CEST 2006 - jimmyk@suse.de
+
+- Modify existing gnome-system-monitor-sysinfo.patch to properly parse
+ /proc/cpuinfo on ppc architecture and avoid crashing, BNC #179031.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.NZYIre/_old 2006-06-06 22:23:16.000000000 +0200
+++ /var/tmp/diff_new_pack.NZYIre/_new 2006-06-06 22:23:16.000000000 +0200
@@ -16,7 +16,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.12.2
-Release: 30
+Release: 32
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.0/%{name}-%{version}.tar.bz2
Source1: n-side.png
URL: http://www.gnome.org
@@ -47,7 +47,7 @@
%setup
gnome-patch-translation-prepare
%patch -p1
-%patch1
+%patch1 -p1
%patch2
gnome-patch-translation-update
%{?suse_update_config:%{suse_update_config}}
@@ -103,6 +103,9 @@
%{sysconfdir}/gconf/schemas/gnome-system-monitor.schemas
%changelog -n gnome-system-monitor
+* Tue Jun 06 2006 - jimmyk@suse.de
+- Modify existing gnome-system-monitor-sysinfo.patch to properly parse
+ /proc/cpuinfo on ppc architecture and avoid crashing, BNC #179031.
* Mon May 22 2006 - jpr@suse.de
- don't display the VERSION info from /etc/SuSE-release, its confusing
(#177632)
++++++ gnome-system-monitor-sysinfo.patch ++++++
--- /var/tmp/diff_new_pack.NZYIre/_old 2006-06-06 22:23:16.000000000 +0200
+++ /var/tmp/diff_new_pack.NZYIre/_new 2006-06-06 22:23:16.000000000 +0200
@@ -1,6 +1,7 @@
---- src/callbacks.c
-+++ src/callbacks.c
-@@ -374,7 +374,7 @@
+diff -urpN gnome-system-monitor-2.12.2-pristine/src/callbacks.c gnome-system-monitor-2.12.2/src/callbacks.c
+--- gnome-system-monitor-2.12.2-pristine/src/callbacks.c 2005-08-11 10:50:26.000000000 -0400
++++ gnome-system-monitor-2.12.2/src/callbacks.c 2006-06-06 11:28:44.000000000 -0400
+@@ -374,7 +374,7 @@ cb_change_current_page (GtkNotebook *nb,
procdata->config.current_tab = num;
@@ -9,7 +10,7 @@
cb_timeout (procdata);
-@@ -396,7 +396,7 @@
+@@ -396,7 +396,7 @@ cb_change_current_page (GtkNotebook *nb,
}
@@ -18,7 +19,7 @@
load_graph_start (procdata->cpu_graph);
load_graph_start (procdata->mem_graph);
load_graph_start (procdata->net_graph);
-@@ -408,7 +408,7 @@
+@@ -408,7 +408,7 @@ cb_change_current_page (GtkNotebook *nb,
}
@@ -27,8 +28,9 @@
cb_update_disks (procdata);
---- src/interface.c
-+++ src/interface.c
+diff -urpN gnome-system-monitor-2.12.2-pristine/src/interface.c gnome-system-monitor-2.12.2/src/interface.c
+--- gnome-system-monitor-2.12.2-pristine/src/interface.c 2005-08-11 10:50:26.000000000 -0400
++++ gnome-system-monitor-2.12.2/src/interface.c 2006-06-06 15:52:31.000000000 -0400
@@ -29,6 +29,8 @@
#include
#include
@@ -38,7 +40,7 @@
#include "procman.h"
#include "callbacks.h"
-@@ -155,6 +157,384 @@
+@@ -155,6 +157,413 @@ static const char ui_info[] =
" "
" </popup>";
@@ -54,12 +56,15 @@
+ guint64 free_space_bytes;
+} SysInfoData;
+
++static SysInfoData *get_system_information (void);
++static void sys_info_data_free (SysInfoData *);
++
+static void load_distro_info (SysInfoData *);
+static void load_memory_info (SysInfoData *);
+static void load_processor_info (SysInfoData *);
+static void load_disk_space_info (SysInfoData *);
+
-+SysInfoData *
++static SysInfoData *
+get_system_information ()
+{
+ SysInfoData *data = g_new0 (SysInfoData, 1);
@@ -73,6 +78,25 @@
+}
+
+static void
++sys_info_data_free (SysInfoData *data)
++{
++ gint i;
++
++ g_return_if_fail (data);
++
++ g_free (data->distro_name);
++ g_free (data->distro_version);
++ g_free (data->distro_release);
++
++ for (i = 0; i < data->n_processors; ++i)
++ g_free (data->processor_models [i]);
++
++ g_free (data->processor_models);
++
++ g_free (data);
++}
++
++static void
+load_distro_info (SysInfoData *data)
+{
+ gchar *contents;
@@ -202,13 +226,18 @@
+ if (strstr (lines [i], "model name\t:")) {
+ cursor = strstr (lines [i], ":");
+
-+ g_strstrip (++ cursor);
++ if (strlen (cursor) > 1) {
++ g_strstrip (++ cursor);
+
-+ processors = g_list_append (processors, cursor);
++ processors = g_list_append (processors, cursor);
++ }
+
+ break;
+ }
+ }
++
++ if (! lines [i])
++ break;
+ }
+ }
+
@@ -418,12 +447,14 @@
+ );
+ g_free (markup);
+
++ sys_info_data_free (data);
++
+ return hbox;
+}
static GtkWidget *
create_proc_view (ProcData *procdata)
-@@ -676,6 +1072,8 @@
+@@ -676,6 +1085,8 @@ create_main_window (ProcData *procdata)
GtkWidget *tab_label1, *tab_label2, *tab_label3;
GtkWidget *vbox1;
GtkWidget *sys_box, *devices_box;
@@ -432,7 +463,7 @@
app = gnome_app_new ("procman", _("System Monitor"));
-@@ -742,6 +1140,12 @@
+@@ -742,6 +1153,12 @@ create_main_window (ProcData *procdata)
0);
gtk_widget_show (notebook);
@@ -445,9 +476,11 @@
vbox1 = create_proc_view (procdata);
gtk_widget_show (vbox1);
tab_label1 = gtk_label_new (_("Processes"));
---- src/procdialogs.c
-+++ src/procdialogs.c
-@@ -799,7 +799,7 @@
+Files gnome-system-monitor-2.12.2-pristine/src/.interface.c.swp and gnome-system-monitor-2.12.2/src/.interface.c.swp differ
+diff -urpN gnome-system-monitor-2.12.2-pristine/src/procdialogs.c gnome-system-monitor-2.12.2/src/procdialogs.c
+--- gnome-system-monitor-2.12.2-pristine/src/procdialogs.c 2005-07-07 19:41:25.000000000 -0400
++++ gnome-system-monitor-2.12.2/src/procdialogs.c 2006-06-06 11:28:44.000000000 -0400
+@@ -799,7 +799,7 @@ procdialog_create_preferences_dialog (Pr
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (prefs_dialog_button_pressed), procdata);
@@ -456,9 +489,10 @@
gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
else
gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1);
---- src/procman.c
-+++ src/procman.c
-@@ -73,7 +73,7 @@
+diff -urpN gnome-system-monitor-2.12.2-pristine/src/procman.c gnome-system-monitor-2.12.2/src/procman.c
+--- gnome-system-monitor-2.12.2-pristine/src/procman.c 2005-10-01 03:47:21.000000000 -0400
++++ gnome-system-monitor-2.12.2/src/procman.c 2006-06-06 11:28:44.000000000 -0400
+@@ -73,7 +73,7 @@ view_as_changed_cb (GConfClient *client,
GConfValue *value = gconf_entry_get_value (entry);
procdata->config.whose_process = gconf_value_get_int (value);
@@ -467,7 +501,7 @@
proctable_clear_tree (procdata);
proctable_update_all (procdata);
-@@ -385,7 +385,7 @@
+@@ -385,7 +385,7 @@ procman_data_new (GConfClient *client)
pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);
pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);
pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org