pool/gnome-system-monitor
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-system-monitor?expand=0&rev=36

Browse Source
This commit is contained in:
OBS User unknown 2009-07-31 17:35:14 +00:00 committed by Git OBS Bridge
parent 80421f304c
commit 6b6b14b051
6 changed files with 38 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-system-monitor-2.26.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22f67671756c4d5c860d1201f27d87830479fc923384f8dae5bcd24cb5f3dd7e
size 2188963

3
gnome-system-monitor-2.27.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c9b76da23ab99c37c8f7e822b6236cbde2083b7d749a0e5aabb62fd154b0a43
size 2155218

73
gnome-system-monitor-bgo566962-leaks.diff
View File

@ -1,73 +0,0 @@
Index: src/procman.h
===================================================================
--- src/procman.h (revision 2544)
+++ src/procman.h (working copy)
@@ -96,12 +96,10 @@
struct MutableProcInfo
{
MutableProcInfo()
- : user(0),
- status(0)
+ : status(0)
{ }
- // shared, don't free it !
- const gchar* user;
+ std::string user;
gchar wchan[40];
@@ -132,7 +130,7 @@
/* undefined */ ProcInfo& operator=(const ProcInfo&);
/* undefined */ ProcInfo(const ProcInfo&);
- typedef std::map<guint, const char*> UserMap;
+ typedef std::map<guint, std::string> UserMap;
/* cached username */
static UserMap users;
Index: src/proctable.cpp
===================================================================
--- src/proctable.cpp (revision 2544)
+++ src/proctable.cpp (working copy)
@@ -24,6 +24,7 @@
#include <string.h>
#include <math.h>
#include <glib/gi18n.h>
+#include <glib/gprintf.h>
#include <glibtop.h>
#include <glibtop/loadavg.h>
#include <glibtop/proclist.h>
@@ -465,16 +466,16 @@
// procman_debug("User lookup for uid %u: %s", uid, (p.second ? "MISS" : "HIT"));
if (p.second) {
- char* username;
struct passwd* pwd;
pwd = getpwuid(uid);
if (pwd && pwd->pw_name)
- username = g_strdup(pwd->pw_name);
- else
- username = g_strdup_printf("%u", uid);
-
- p.first->second = username;
+ p.first->second = pwd->pw_name;
+ else {
+ char username[16];
+ g_sprintf(username, "%u", uid);
+ p.first->second = username;
+ }
}
this->user = p.first->second;
@@ -543,7 +544,7 @@
using procman::tree_store_update;
tree_store_update(model, &info->node, COL_STATUS, info->status);
- tree_store_update(model, &info->node, COL_USER, info->user);
+ tree_store_update(model, &info->node, COL_USER, info->user.c_str());
tree_store_update(model, &info->node, COL_VMSIZE, info->vmsize);
tree_store_update(model, &info->node, COL_MEMRES, info->memres);
tree_store_update(model, &info->node, COL_MEMWRITABLE, info->memwritable);

31
gnome-system-monitor-fate302198.diff
View File

@ -404,7 +404,7 @@ Index: src/sysinfo.cpp
===================================================================
--- src/sysinfo.cpp.orig
+++ src/sysinfo.cpp
@@ -13,6 +13,8 @@
@@ -14,6 +14,8 @@
#include <glibtop/mem.h>
#include <glibtop/sysinfo.h>
@ -413,7 +413,7 @@ Index: src/sysinfo.cpp
#include <unistd.h>
#include <netdb.h>
#include <sys/socket.h>
@@ -36,6 +38,18 @@ using std::vector;
@@ -38,6 +40,18 @@ using std::vector;
namespace {
@ -432,7 +432,7 @@ Index: src/sysinfo.cpp
class SysInfo
{
@@ -51,6 +65,12 @@ namespace {
@@ -53,6 +67,12 @@ namespace {
guint n_processors;
vector<string> processors;
@ -445,7 +445,7 @@ Index: src/sysinfo.cpp
SysInfo()
{
@@ -59,6 +79,7 @@ namespace {
@@ -61,6 +81,7 @@ namespace {
this->load_disk_info();
this->load_uname_info();
this->load_gnome_version();
@ -453,7 +453,7 @@ Index: src/sysinfo.cpp
}
virtual ~SysInfo()
@@ -182,6 +203,49 @@ namespace {
@@ -195,6 +216,49 @@ namespace {
this->gnome_version = values[0] + '.' + values[1] + '.' + values[2];
}
@ -503,7 +503,7 @@ Index: src/sysinfo.cpp
};
@@ -485,6 +549,10 @@ procman_create_sysinfo_view(void)
@@ -524,6 +588,10 @@ procman_create_sysinfo_view(void)
GtkWidget *memory_label;
GtkWidget *processor_label;
@ -514,25 +514,22 @@ Index: src/sysinfo.cpp
GtkWidget *disk_space_table;
GtkWidget *disk_space_label;
@@ -571,17 +639,20 @@ procman_create_sysinfo_view(void)
@@ -611,15 +679,19 @@ procman_create_sysinfo_view(void)
/* hardware section */
- markup = g_strdup_printf(_("<b>Hardware</b>"));
markup = g_strdup_printf(_("<b>Hardware</b>"));
- hardware_table = add_section(GTK_BOX(vbox), markup, data->processors.size(), 2, NULL);
- g_free(markup);
+ hardware_table = add_section(GTK_BOX(vbox), _("<b>Hardware</b>"),
+ data->processors.size() + 4, 2, NULL);
+
+ add_row(GTK_TABLE(hardware_table), _("Machine model:"),
+ data->machine_type_model.c_str(), 0);
+ hardware_table = add_section(GTK_BOX(vbox), markup, data->processors.size() + 4, 2, NULL);
g_free(markup);
+ add_row(GTK_TABLE(hardware_table), _("Machine model:"),
+ data->machine_type_model.c_str(), 0);
+
markup = procman::format_size(data->memory_bytes);
memory_label = add_row(GTK_TABLE(hardware_table), _("Memory:"),
- markup, 0);
+ markup, 1);
g_free(markup);
header = gtk_label_new(_("Memory:"));
- for (guint i = 0; i < data->processors.size(); ++i) {
+ guint i;
@ -540,7 +537,7 @@ Index: src/sysinfo.cpp
const gchar * t;
if (data->processors.size() > 1) {
markup = g_strdup_printf(_("Processor %d:"), i);
@@ -593,20 +664,33 @@ procman_create_sysinfo_view(void)
@@ -631,20 +703,33 @@ procman_create_sysinfo_view(void)
}
processor_label = add_row(GTK_TABLE(hardware_table), t,

17
gnome-system-monitor.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 22 12:12:39 CEST 2009 - coolo@novell.com
- do not require lsb but the binary needed (in lsb-release on 11.2)
-------------------------------------------------------------------
Mon Jul 20 11:31:41 CEST 2009 - vuntz@novell.com
- Update to version 2.27.4:
+ NetBSD sysinfo support.
- Changes from version 2.27.3:
+ Fixed a small memory leak.
+ No more deprecated GTK+ symbols.
+ Network speed can be also displayed in bits.
- Drop gnome-system-monitor-bgo566962-leaks.diff: fixed upstream.
- Respin gnome-system-monitor-fate302198.diff.
-------------------------------------------------------------------
Sat May 23 14:04:26 CEST 2009 - vuntz@novell.com

343
gnome-system-monitor.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-system-monitor (Version 2.26.2)
# spec file for package gnome-system-monitor (Version 2.27.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -37,11 +37,9 @@ BuildRequires: hal-devel
BuildRequires: hwinfo-devel
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.26.2
Version: 2.27.4
Release: 1
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gnome-system-monitor-bgo566962-leaks.diff bgo#566962 hfiguiere@novell.com
Patch0: gnome-system-monitor-bgo566962-leaks.diff
# PATCH-FEATURE-OPENSUSE gnome-system-monitor-fate302198.diff FATE#302198 bgo582311 hfiguiere@novell.com -- Add a hardware tab
Patch1: gnome-system-monitor-fate302198.diff
# PATCH-FEATURE-OPENSUSE gnome-system-monitor-fate304741.diff FATE#304741 bgo582312 hfiguiere@novell.com -- Add a thinkpad tab
@ -51,7 +49,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A Simple Process Monitor
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
Requires: lsb
Requires: /usr/bin/lsb_release
%gconf_schemas_prereq
%description
@ -68,7 +66,6 @@ Authors:
%lang_package
%prep
%setup -q
%patch0 -p0
%patch1
%patch2 -p1
@ -94,6 +91,7 @@ cat %{name}.schemas_list >%{name}.lst
rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
@ -111,336 +109,3 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}.lang
%changelog
* Sat May 23 2009 vuntz@novell.com
- Update to version 2.26.2:
+ Updated translations.
* Tue May 12 2009 vuntz@novell.com
- Correctly tag patches.
* Tue Apr 14 2009 vuntz@novell.com
- Update to version 2.26.1:
+ Small bugfix about hiding pseudo filesystems.
* Mon Apr 06 2009 vuntz@novell.com
- Respin gnome-system-monitor-fate304741.diff that doesn't apply
with new patch package.
* Mon Mar 16 2009 vuntz@novell.com
- Update to version 2.26.0.1:
+ Updated translations.
* Fri Mar 06 2009 vuntz@novell.com
- Update to version 2.26.0:
+ Fixed potential segfault with broken icon themes (bgo#573030).
* Tue Feb 17 2009 mboman@suse.de
- Update to version 2.25.91:
+ A few bugfixes
+ Faster startup (spaws lsb_release only when needed)
- Remove docbook-xsl-stylesheets, glib2-devel, gnome-common,
gnome-vfs2-devel, libglade2-devel, perl-XML-Parser, scrollkeeper
from BuildRequires
- Add dbus-1-glib-devel to BuildRequires
* Tue Feb 03 2009 hfiguiere@suse.de
- Update gnome-system-monitor-fate302198.diff to fix slow startup.
(bnc#447370)
* Mon Feb 02 2009 mboman@suse.de
- Update to version 2.24.4:
+ Fixed license: system-monitor is GPL-2
+ Fixed small memory leak
- Updated gnome-system-monitor-bgo566962-leaks.diff. Partly fixed
upstream
* Fri Jan 23 2009 vuntz@novell.com
- Requires lsb (change was done by Magnus Boman, iirc).
* Thu Jan 08 2009 hfiguiere@suse.de
- Add gnome-system-monitor-bgo566962-leaks.diff
* Fix memory leaks (bgo#566962)
* Wed Oct 22 2008 mboman@suse.de
- Update to version 2.24.1:
+ Translation updates
* Wed Sep 24 2008 mboman@suse.de
- Update to version 2.24.0:
+ Translation updates
* Fri Sep 12 2008 hfiguiere@suse.de
- Add gnome-system-monitor-fate304741.diff
* FATE#304741: add a thinkpad ACPI tab. (only on thinkpad)
* Tue Sep 09 2008 hfiguiere@suse.de
- Add gnome-system-monitor-fate302198.diff
* FATE 302198: add a hardware tab in g-s-m.
* new requirements: hal and hwinfo.
* call autoreconf in the spec.
* Mon Sep 01 2008 mboman@novell.com
- Update to version 2.23.91:
+ Fixed bgo#549383 – network assertion in the resource tab.
* Tue Aug 26 2008 mboman@novell.com
- Update to version 2.23.90:
+ Fixed truncated process names.
* Tue Aug 05 2008 captain.magnus@opensuse.org
- Update to version 2.23.6:
+ Don't segfault in the disk list when icon cannot be retried from gvfs.
+ Fixed network speed when there are pseudo-devices with no address.
* Wed Jun 25 2008 maw@suse.de
- Update to version 2.23.3:
+ New option to start with the system tab
+ Port to gio
+ Misc new features
+ Bug fixes
- Drop the following upstreamed patches:
gnome-system-monitor-sysinfo.patch and
gnome-system-monitor-performance.patch.
* Fri May 09 2008 jpr@suse.de
- Update to version 2.22.1
* lsof: don't crash on invalid regex (#524162).
* graphs: fixed the time scale (#521394).
- Add gnome-system-monitor-performance.patch to Fix performance on
certain video cards (bnc #374934)
* Fri Mar 14 2008 maw@suse.de
- Update to version 2.22.0:
+ Updated translations.
* Thu Mar 13 2008 sbrabec@suse.cz
- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
* Wed Mar 05 2008 maw@suse.de
- Update to version 2.21.92:
+ Dropped dependency on pcrecpp (and thus drop pcre-devel from
BuildRequires)
+ Improved network Y-scale in the Resources tab
+ Enabled transparent theming
+ All graphs CPU colors are stored in gconf /cpu_color{n} keys
+ Non-blocking lsb_release call : may improve startup time
+ A bunch of cleanups / c++-ification.
* Fri Feb 01 2008 maw@suse.de
- Update to version 2.21.5:
+ Use more stock menu entries
+ New color pickers in the resources tab
+ Many graph improvements
+ The network graph now shows a sensible Y-scale
+ The process list can now be manually refreshed
+ Fixed kernel process' tooltips.
* Thu Dec 20 2007 jpr@suse.de
- Update to version 2.21.4
* 'Arguments' column is now correctly escaped for markup
(bgo #498569)
* Graph improvements
* Performance improvement in the process list
* Removed space to the left of process name (bgo #307762)
* Requires GTK+ >= 2.12.
* Documentation update
* Displays N/A when memory stats are not available. Memory stats
are not available for processes like kernel ones or if the user
can't access the memory stats (which happens on linux sysctl
kernel.maps_protect = 1) (bgo #487105)
* A few cleanups replacing overcomplicated treeview usage by
gtk_tree_view_column_set_cell_data_func.
* Fixed liststore usage in the disk list.
* Updated translations.
- Improve BuildRequires, removing gnutls-devel and
libgnomeprintui-devel
* Wed Sep 19 2007 sbrabec@suse.cz
- Updated to version 2.20.0:
* minor fixes
* updated translations
* Fri Aug 31 2007 maw@suse.de
- Update to version 2.19.91.1:
+ Build fix
+ Fixed logo mis-rendering in the system info tab (b.g.o
[#405739]).
* Thu Aug 30 2007 sreeves@suse.de
- fix for #253997
* Tue Aug 07 2007 maw@suse.de
- Split off a -lang subpackage.
* Thu Aug 02 2007 maw@suse.de
- Update to version 2.19.6:
+ Bugs (bugzilla.gnome.org) fixed: #459598, #460511, #455826,
[#450545], #367016, #399069, and #451932
- Use %%fdupes.
* Fri Jul 27 2007 sbrabec@suse.cz
- Reverted libgtop-2_0-7-devel to libgtop-devel.
* Tue Jul 10 2007 maw@suse.de
- Update to version 2.19.4
* Fixed hostname in the sysinfo tab.
* Big cleanup of the process list code.
* Reworded and fixed the process dependency tree.
* Fixed crash on startup with dependencies+myprocesses.
* pcre is back for good.
* Use regex in the default icon table. This results in more icons :)
* Every process now has a default icon.
* Simplified lsof code with regex.
* Lots of stuff git-log doesn't remember.
- From the project's official changelog:
* Some GTKmm :)
- Also from the project's official changelog:
* Disable pcrecpp by default. You really want to enable this
(Your humble packager has no comment on the above, but has indeed
enabled it.)
- Buildrequire libgtop-2_0-7-devel instead of libgtop-devel; also
buildrequire pcre-devel.
* Fri Apr 27 2007 sbrabec@suse.cz
- Do not call meinproc (#227624).
* Thu Apr 12 2007 maw@suse.de
- Update to version 2.18.1
- Minor code cleanups
- Improved startup time
- Updated translations.
* Wed Apr 04 2007 maw@suse.de
- Update to version 2.18.0
- Cleaned up .desktop files
- b.g.o 413919, 412953, and 409427.
* Wed Mar 28 2007 jhargadon@suse.de
- added intltoolize to the specfile (#258379)
* Tue Mar 27 2007 sbrabec@suse.cz
- Build on all products (call glib-gettextize, require gcc-c++).
* Fri Mar 09 2007 maw@suse.de
- Update to version 2.17.91
- * Bézier curves by Lucas Mazzardo Veloso.
* Moved to gnome-doc-utils by Paroz.
* No longer depends ton libgnome.
* Fixed bugs #374090, #352507, #328287 and #402013
New in 2.17.6 - 22 January 2007
* Dropped libgnomeui dependency.
* GNOME logo enhanced by Luca Cavalli.
* Various code improvements.
New in 2.17.5 - 8 January 2007
* More C++
* Tuned the behaviour of smooth refresh.
* A few code improvments.
New in 2.17.4.2 - 19 December 2006
* Fixed build with strict C++ compilers.
New in 2.17.4.1 - 18 December 2006
* Fixed POTFILES.in. Sorry :/
New in 2.17.4 - 17 December 2006
* 100%% C++.
* Disabled libsexy because it is buggy and unmaintained.
* Fixed build on solaris.
New in 2.17.3 - 4 December 2006
* Renamed the Arguments column as "Command Line".
* Fixed gconf schema.
* Use lsb_release when available to get distro information.
* Disabled the process blacklist.
* More C++ :)
New in 2.17.2 - 5 november 2006
* This is the first 2.17.x release.
* New lsof feature. Temporarily requires pcre, see #367827.
* New SysInfo tab from OpenSuse. Artwork by Baptiste Mille-Mathias.
* Some code cleanups.
* Fixed sensitivity of the View menu.
* New features have been developed in C++, old C code will be soon compiled
as C++.
* Mon Dec 18 2006 sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
* Tue Oct 03 2006 jhargadon@suse.de
- update to version 2.16.1
- Fixed locales dir initialization
- Fixed memory maps for 64bits kernel running a 32bits system-monitor
- Fixed gksu password prompt
- Fixed a small memory leak
- Fixed schema
* Thu Aug 31 2006 jhargadon@suse.de
- update to version 2.15.92
- Fixed LoadGraph overlay
- Fixed tiny leak
- Fixed font and alignment of various columns
* Wed Aug 23 2006 jhargadon@suse.de
- update to version 2.15.91
- Renamed Devices tab as File Systems.
- Updated translations.
- Fixed segfault is libselinux not installed.
- The disks list is now correctly updated.
- Double-click in disks list opens the corresponding volume.
- debug messages are displayed on command line if
GNOME_SYSTEM_MONITOR_DEBUG is defined.
- No more compile dependency on libselinux.
- Process arguments with line feeds are now escaped.
- Displays scale on graphs.
- Can use libsexy to display process arguments.
- New memory column : displays estimated memory usage.
- Fixed a couple of small leaks.
* Thu Jul 20 2006 jpr@suse.de
- Call aclocal to fix build after altering configure.in in %%prep
* 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)
* Mon May 01 2006 jpr@suse.de
- Remember the devices page if its the last used (#171137
* Wed Mar 29 2006 jpr@suse.de
- Fix page numbers to reflect prepended page (fixes #161815, #157490)
* Tue Mar 28 2006 joeshaw@suse.de
- Add a patch to show the "Resident" field by default, not the
"Virtual memory" field. Fixes half of bnc #157022.
* Fri Mar 24 2006 jimmyk@suse.de
- Fix for BNC #158516.
* Mon Mar 13 2006 rml@suse.de
- Update gnome-system-monitor-sysinfo.patch to not display the
distribution release if there is no such release (e.g., on SUSE
Linux)
* Thu Mar 02 2006 sbrabec@suse.cz
- Added support for gnome-patch-translation.
* Tue Feb 28 2006 sbrabec@suse.cz
- Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14).
* Mon Feb 27 2006 jimmyk@suse.de
- added system info tab (BNC #67255)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Nov 30 2005 gekker@suse.de
- Update to version 2.12.2
* Thu Oct 13 2005 gekker@suse.de
- Update to version 2.12.1
* Tue Sep 06 2005 gekker@suse.de
- Update to version 2.12.0 (GNOME 2.12)
* Tue Aug 23 2005 gekker@suse.de
- Update to version 2.11.92
* Mon Aug 08 2005 rodrigo@suse.de
- Update to 2.11.91
* Tue Aug 02 2005 gekker@suse.de
- Update to version 2.11.90
* Fri Jul 22 2005 gekker@suse.de
- Update to version 2.11.5
* Mon Jun 20 2005 gekker@suse.de
- Update to version 2.11.3
* Wed Mar 16 2005 clahey@suse.de
- Remove patch to remove icon.
- Add patch to fix menu name.
* Wed Mar 09 2005 gekker@suse.de
- Update to version 2.10.0 (GNOME 2.10).
* Thu Mar 03 2005 gekker@suse.de
- Update to version 2.9.92
- Removed dependency on libgnomesu
* Fri Feb 11 2005 gekker@suse.de
- Update to version 2.9.91
* Fri Feb 04 2005 hhetter@suse.de
- updated to version 2.9.90
* Thu Nov 25 2004 ro@suse.de
- added suse_update_desktop_file
* Fri Nov 19 2004 ro@suse.de
- update to 2.8.0 (makes it build with recent gtk2)
* Tue Nov 02 2004 ro@suse.de
- locale rename: no -> nb
* Fri Aug 27 2004 clahey@suse.de
- Cache gnome-system-monitor help and show gnome-system-monitor in khelpcenter.
* Fri Apr 30 2004 hhetter@suse.de
- updated to 2.6.0 [GNOME2.6]
- added #neededforbuild perl-XML-Parser
* Wed Mar 17 2004 sbrabec@suse.cz
- Fixed scrollkeeper calling conventions (#36215).
* Wed Mar 10 2004 sbrabec@suse.cz
- Fixed gconf schemas installation (#33114).
* Fri Feb 20 2004 sbrabec@suse.cz
- Fixed names of GNOME2 packages.
* Thu Feb 12 2004 hhetter@suse.de
- gconf schema (de-)installation in %%post and %%postun
* Sat Jan 10 2004 adrian@suse.de
- build as user
* Mon Sep 29 2003 hhetter@suse.de
- updated to version 2.4.0 [GNOME2.4]
* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Mon Jun 30 2003 sbrabec@suse.cz
- Provide and obsolete procman.
* Thu Jun 26 2003 sbrabec@suse.cz
- Updated to version 2.0.5.
- Updated neededforbuild.
- Use %%find_lang.
* Mon Feb 10 2003 hhetter@suse.de
- updated to version 2.0.4 [GNOME 2.2.0]
* Tue Jan 14 2003 ro@suse.de
- added expat to neededforbuild
* Tue Oct 01 2002 sbrabec@suse.cz
- Added new package.