--- a/ChangeLog	Thu Jul 27 12:50:45 2006 +0000
+++ b/ChangeLog	Thu Jul 27 13:48:13 2006 +0000
@@ -1,5 +1,6 @@
 2006-07-27  Damien Carbery <[email protected]>
 
+	* patches/gnome-system-monitor-01-solaris.diff: Rework.
 	* firefox.spec: Remove 'aclocal' dir as it is now empty.
 	* patches/nautilus-16-interface-changes.diff: Rework.
 

--- a/patches/gnome-system-monitor-01-solaris.diff	Thu Jul 27 12:50:45 2006 +0000
+++ b/patches/gnome-system-monitor-01-solaris.diff	Thu Jul 27 13:48:13 2006 +0000
@@ -1,9 +1,8 @@
-diff -Nrup gnome-system-monitor-2.14.1/configure.in gnome-system-monitor-2.14.1.mod/configure.in
---- gnome-system-monitor-2.14.1/configure.in	2006-04-10 01:39:27.000000000 +0800
-+++ gnome-system-monitor-2.14.1.mod/configure.in	2006-06-23 17:17:39.797532000 +0800
-@@ -31,6 +31,12 @@ GNOME_VFS_REQUIRED=2.6.0
- LIBGKSUUI_REQUIRED=1.0.0
- LIBGKSU_REQUIRED=0.15.0
+--- gnome-system-monitor-2.15.90/configure.in.orig	2006-07-27 14:20:43.894249000 +0100
++++ gnome-system-monitor-2.15.90/configure.in	2006-07-27 14:21:10.814488000 +0100
+@@ -31,6 +31,12 @@
+ GNOME_VFS_REQUIRED=2.6.0
+ GNOME_ICON_THEME_REQUIRED=2.15.3
  
 +case "$host" in
 +*-*-solaris*) GMSGFMT_CHECKOPT= ;;
@@ -11,7 +10,7 @@
 +esac
 +AC_SUBST( GMSGFMT_CHECKOPT)
 +
- PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED)
+ PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED)
  
  
 diff -Nrup gnome-system-monitor-2.14.1/po/Makefile.in.in gnome-system-monitor-2.14.1.mod/po/Makefile.in.in
@@ -232,11 +231,20 @@
  
  
  enum {
-@@ -71,7 +75,7 @@ struct _LoadGraph {
+@@ -61,7 +61,7 @@
+ 
+ 	LoadGraphLabels labels;
+ 
+-	/* union { */
++	union {
+ 		struct {
+ 			gboolean initialized;
+ 			guint now; /* 0 -> current, 1 -> last
+@@ -75,7 +75,7 @@
  			GTimeVal time;
  			float max;
  		} net;
--	};
+-	/* }; */
 +	}category;
  };
  
@@ -566,31 +574,29 @@
  static guint64 total_time = 1;
  static guint64 total_time_last = 1;
  
-@@ -533,16 +532,19 @@ get_process_memory_info(ProcInfo *info)
+@@ -579,16 +579,17 @@
  	wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
  				      info->pid,
  				      &xresources);
 +	info->memxserver = xresources.total_bytes_estimate;
-+	
+ 
+-	glibtop_get_proc_mem(&procmem, info->pid);
 +	get_process_memory_writable(info);
  
- 	glibtop_get_proc_mem(&procmem, info->pid);
--
++	glibtop_get_proc_mem(&procmem, info->pid);
  	info->vmsize	= procmem.vsize;
  	info->memres	= procmem.resident;
 -	info->memshared	= procmem.share;
--
+ 
 -	info->memxserver = xresources.total_bytes_estimate;
-+        info->memshared = procmem.share;
-+	
+-
+-	get_process_memory_writable(info);
 +#ifdef __sun
-+	info->pcpu	= procmem.load;
++	info->pcpu      = procmem.load;
 +#endif
  
--	get_process_memory_writable(info);
+ 	info->mem = info->memxserver + info->memwritable;
  }
- 
- 
 @@ -795,15 +797,16 @@ update_info (ProcData *procdata, ProcInf
  		glibtop_get_proc_uid (&procuid, info->pid);
  		glibtop_get_proc_time (&proctime, info->pid);
@@ -665,22 +671,21 @@
 diff -Nrup gnome-system-monitor-2.14.1/src/selinux.h gnome-system-monitor-2.14.1.mod/src/selinux.h
 --- gnome-system-monitor-2.14.1/src/selinux.h	2005-05-25 20:15:45.000000000 +0800
 +++ gnome-system-monitor-2.14.1.mod/src/selinux.h	2006-07-19 19:49:34.954362000 +0800
-@@ -8,11 +8,11 @@
+@@ -5,10 +5,10 @@
  
- #if HAVE_SELINUX
+ #include "procman.h"
  
 -void
 -get_process_selinux_context (ProcInfo *info) G_GNUC_INTERNAL;
 +G_GNUC_INTERNAL void
-+get_process_selinux_context (ProcInfo *info) ;
++get_process_selinux_context (ProcInfo *info);
  
 -gboolean
--can_show_security_context_column (void) G_GNUC_INTERNAL;
+-can_show_security_context_column (void) G_GNUC_INTERNAL G_GNUC_CONST;
 +G_GNUC_INTERNAL gboolean
-+can_show_security_context_column (void) ;
++can_show_security_context_column (void) G_GNUC_CONST;
  
- #else /* ! HAVE_SELINUX */
- 
+ #endif /* PROCMAN_SELINUX_H_20050525 */
 diff -Nrup gnome-system-monitor-2.14.1/src/smooth_refresh.c gnome-system-monitor-2.14.1.mod/src/smooth_refresh.c
 --- gnome-system-monitor-2.14.1/src/smooth_refresh.c	2005-12-28 00:14:59.000000000 +0800
 +++ gnome-system-monitor-2.14.1.mod/src/smooth_refresh.c	2006-07-19 18:47:58.412015000 +0800
@@ -783,3 +788,19 @@
  
  
  #endif /* H_GNOME_SYSTEM_MONITOR_UTIL_1123178725 */
+@@ -29,11 +29,11 @@
+ SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) ;
+ 
+ 
+-gboolean
+-load_symbols(const char *module, ...) G_GNUC_INTERNAL G_GNUC_NULL_TERMINATED;
++G_GNUC_INTERNAL gboolean
++load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
+ 
+ 
+-void
+-procman_debug(const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
++G_GNUC_INTERNAL void
++procman_debug(const char *format, ...) G_GNUC_PRINTF(1, 2);
+ 
+ #endif /* H_GNOME_SYSTEM_MONITOR_UTIL_1123178725 */