main/gnome-system-monitor: rebuild against glib-2.32

12 files changed, 616 insertions, 4 deletions

diff --git a/main/gnome-system-monitor/001-duplicate-label.patch b/main/gnome-system-monitor/001-duplicate-label.patch
new file mode 100644
index 0000000000..97355312fb
--- /dev/null
+++ b/main/gnome-system-monitor/001-duplicate-label.patch
@@ -0,0 +1,31 @@
+From dd7f7953d01a3e1b8bd78334aed05c016558df85 Mon Sep 17 00:00:00 2001
+From: Andreas Nilsson <nisses.mail@home.se>
+Date: Tue, 26 Oct 2010 15:09:15 +0000
+Subject: Remove duplicate label in File System tab
+
+https://bugzilla.gnome.org/show_bug.cgi?id=597250
+---
+diff --git a/src/disks.cpp b/src/disks.cpp
+index 172fc7a..c694c0a 100644
+--- a/src/disks.cpp
++++ b/src/disks.cpp
+@@ -288,7 +288,6 @@ GtkWidget *
+ create_disk_view(ProcData *procdata)
+ {
+ 	GtkWidget *disk_box;
+-	GtkWidget *label;
+ 	GtkWidget *scrolled;
+ 	GtkWidget *disk_tree;
+ 	GtkListStore *model;
+@@ -310,9 +309,6 @@ create_disk_view(ProcData *procdata)
+ 
+ 	gtk_container_set_border_width(GTK_CONTAINER(disk_box), 12);
+ 
+-	label = make_title_label(_("File Systems"));
+-	gtk_box_pack_start(GTK_BOX(disk_box), label, FALSE, FALSE, 0);
+-
+ 	scrolled = gtk_scrolled_window_new(NULL, NULL);
+ 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+ 				       GTK_POLICY_AUTOMATIC,
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/002-replace-gtknotebookpage.patch b/main/gnome-system-monitor/002-replace-gtknotebookpage.patch
new file mode 100644
index 0000000000..b1b9a52f04
--- /dev/null
+++ b/main/gnome-system-monitor/002-replace-gtknotebookpage.patch
@@ -0,0 +1,35 @@
+From b72d92a3bebaaa6d7382f582aef149bb604f3e11 Mon Sep 17 00:00:00 2001
+From: Javier Jardón <jjardon@gnome.org>
+Date: Thu, 30 Sep 2010 16:42:44 +0000
+Subject: Replacing GtkNotebookPage with GtkWidget according to changes in GTK+
+
+Signed-off-by: Chris Kühl <chrisk@openismus.com>
+---
+diff --git a/src/callbacks.cpp b/src/callbacks.cpp
+index be2c16a..b0ac269 100644
+--- a/src/callbacks.cpp
++++ b/src/callbacks.cpp
+@@ -323,7 +323,7 @@ cb_tree_popup_menu (GtkWidget *widget, gpointer data)
+ 
+ 
+ void
+-cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
++cb_switch_page (GtkNotebook *nb, GtkWidget *page,
+ 		gint num, gpointer data)
+ {
+ 	cb_change_current_page (nb, num, data);
+diff --git a/src/callbacks.h b/src/callbacks.h
+index 4c84793..6ce3e18 100644
+--- a/src/callbacks.h
++++ b/src/callbacks.h
+@@ -60,7 +60,7 @@ gboolean	cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,
+ 
+ void		cb_change_current_page (GtkNotebook *nb,
+ 					gint num, gpointer data);
+-void		cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
++void		cb_switch_page (GtkNotebook *nb, GtkWidget *page,
+ 				gint num, gpointer data);
+ 
+ gint		cb_update_disks (gpointer data);
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/003-replace-old-drawing.patch b/main/gnome-system-monitor/003-replace-old-drawing.patch
new file mode 100644
index 0000000000..eb7b7615d7
--- /dev/null
+++ b/main/gnome-system-monitor/003-replace-old-drawing.patch
@@ -0,0 +1,115 @@
+From 90d0162efa3d5196a96b07cf8eff8351c322f7f4 Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Wed, 26 Jan 2011 10:51:50 +0000
+Subject: Replace old GDK drawing API
+
+Patch from Sergey Nizovtsev.
+See https://bugzilla.gnome.org/show_bug.cgi?id=627568
+---
+diff --git a/src/load-graph.cpp b/src/load-graph.cpp
+index 79700d4..3cf8683 100644
+--- a/src/load-graph.cpp
++++ b/src/load-graph.cpp
+@@ -87,7 +87,7 @@ void draw_background(LoadGraph *g) {
+ 					allocation.height,
+ 					-1);
+ 	cr = gdk_cairo_create (g->background);
+-	
++
+ 	// set the background colour
+ 	GtkStyle *style = gtk_widget_get_style (ProcData::get_instance()->notebook);
+ 	gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+@@ -95,13 +95,13 @@ void draw_background(LoadGraph *g) {
+ 
+ 	/* draw frame */
+ 	cairo_translate (cr, FRAME_WIDTH, FRAME_WIDTH);
+-	
++
+ 	/* Draw background rectangle */
+ 	cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+ 	cairo_rectangle (cr, g->rmargin + g->indent, 0,
+ 			 g->draw_width - g->rmargin - g->indent, g->real_draw_height);
+ 	cairo_fill(cr);
+-	
++
+ 	cairo_set_line_width (cr, 1.0);
+ 	cairo_set_dash (cr, dash, 2, 0);
+ 	cairo_set_font_size (cr, g->fontsize);
+@@ -191,10 +191,6 @@ load_graph_configure (GtkWidget *widget,
+ 
+ 	g->clear_background();
+ 
+-	if (g->gc == NULL) {
+-		g->gc = gdk_gc_new (GDK_DRAWABLE (gtk_widget_get_window (widget)));
+-	}
+-
+ 	load_graph_draw (g);
+ 
+ 	return TRUE;
+@@ -212,19 +208,14 @@ load_graph_expose (GtkWidget *widget,
+ 	guint i, j;
+ 	gdouble sample_width, x_offset;
+ 
++	window = gtk_widget_get_window (g->disp);
++	gtk_widget_get_allocation (g->disp, &allocation);
++
+ 	if (g->background == NULL) {
+ 		draw_background(g);
++		gdk_window_set_back_pixmap (window, g->background, FALSE);
+ 	}
+ 
+-	window = gtk_widget_get_window (g->disp);
+-	gtk_widget_get_allocation (g->disp, &allocation);
+-	gdk_draw_drawable (window,
+-			   g->gc,
+-			   g->background,
+-			   0, 0, 0, 0, 
+-			   allocation.width,
+-			   allocation.height);
+-
+ 	/* Number of pixels wide for one graph point */
+ 	sample_width = (float)(g->draw_width - g->rmargin - g->indent) / (float)LoadGraph::NUM_POINTS;
+ 	/* General offset */
+@@ -252,7 +243,7 @@ load_graph_expose (GtkWidget *widget,
+ 		for (i = 1; i < LoadGraph::NUM_POINTS; ++i) {
+ 			if (g->data[i][j] == -1.0f)
+ 				continue;
+-			cairo_curve_to (cr, 
++			cairo_curve_to (cr,
+ 				       x_offset - ((i - 0.5f) * g->graph_delx),
+ 				       (1.0f - g->data[i-1][j]) * g->real_draw_height + 3.5f,
+ 				       x_offset - ((i - 0.5f) * g->graph_delx),
+@@ -619,7 +610,6 @@ LoadGraph::LoadGraph(guint type)
+     graph_buffer_offset(0),
+     main_widget(NULL),
+     disp(NULL),
+-    gc(NULL),
+     background(NULL),
+     timer_index(0),
+     draw(FALSE),
+@@ -676,9 +666,9 @@ LoadGraph::LoadGraph(guint type)
+ 	case LOAD_GRAPH_MEM:
+ 		g->colors[0] = ProcData::get_instance()->config.mem_color;
+ 		g->colors[1] = ProcData::get_instance()->config.swap_color;
+-		g->mem_color_picker = gsm_color_button_new (&g->colors[0], 
++		g->mem_color_picker = gsm_color_button_new (&g->colors[0],
+ 							    GSMCP_TYPE_PIE);
+-		g->swap_color_picker = gsm_color_button_new (&g->colors[1], 
++		g->swap_color_picker = gsm_color_button_new (&g->colors[1],
+ 							     GSMCP_TYPE_PIE);
+ 		break;
+ 	case LOAD_GRAPH_NET:
+diff --git a/src/load-graph.h b/src/load-graph.h
+index 6111c78..2dc2b10 100644
+--- a/src/load-graph.h
++++ b/src/load-graph.h
+@@ -66,7 +66,6 @@ struct LoadGraph {
+ 	GtkWidget *main_widget;
+ 	GtkWidget *disp;
+ 
+-	GdkGC *gc;
+ 	GdkDrawable *background;
+ 
+ 	guint timer_index;
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/004-replace-dialog-set.patch b/main/gnome-system-monitor/004-replace-dialog-set.patch
new file mode 100644
index 0000000000..3a6e25aef3
--- /dev/null
+++ b/main/gnome-system-monitor/004-replace-dialog-set.patch
@@ -0,0 +1,67 @@
+From e302c23c43112fe336bf9d0481bdd94fc5af7b21 Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Wed, 26 Jan 2011 13:12:09 +0000
+Subject: Replaced occurances of gtk_dialog_set_has_separator with g_object_set.
+
+---
+diff --git a/src/lsof.cpp b/src/lsof.cpp
+index 24f14a5..7773eff 100644
+--- a/src/lsof.cpp
++++ b/src/lsof.cpp
+@@ -312,7 +312,6 @@ void procman_lsof(ProcData *procdata)
+   //		   G_CALLBACK(close_dialog), NULL);
+   gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
+   gtk_window_set_default_size(GTK_WINDOW(dialog), 575, 400);
+-  // gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+   gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
+   GtkWidget *mainbox = gtk_vbox_new(FALSE, 12);
+   gtk_container_add(GTK_CONTAINER(dialog), mainbox);
+diff --git a/src/memmaps.cpp b/src/memmaps.cpp
+index 9a6fcae..3205721 100644
+--- a/src/memmaps.cpp
++++ b/src/memmaps.cpp
+@@ -608,7 +608,6 @@ create_single_memmaps_dialog (GtkTreeModel *model, GtkTreePath *path,
+ 	gtk_window_set_title(GTK_WINDOW(memmapsdialog), _("Memory Maps"));
+ 	gtk_window_set_resizable(GTK_WINDOW(memmapsdialog), TRUE);
+ 	gtk_window_set_default_size(GTK_WINDOW(memmapsdialog), 575, 400);
+-	// gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ 	gtk_container_set_border_width(GTK_CONTAINER(memmapsdialog), 12);
+ 
+ 	GtkWidget *mainbox = gtk_vbox_new(FALSE, 12);
+diff --git a/src/openfiles.cpp b/src/openfiles.cpp
+index f4a088a..c4ba2c8 100644
+--- a/src/openfiles.cpp
++++ b/src/openfiles.cpp
+@@ -335,7 +335,7 @@ create_single_openfiles_dialog (GtkTreeModel *model, GtkTreePath *path,
+ 						       NULL);
+ 	gtk_window_set_resizable (GTK_WINDOW (openfilesdialog), TRUE);
+ 	gtk_window_set_default_size (GTK_WINDOW (openfilesdialog), 575, 400);
+-	gtk_dialog_set_has_separator (GTK_DIALOG (openfilesdialog), FALSE);
++	g_object_set(G_OBJECT(openfilesdialog), "has-separator", FALSE, NULL);
+ 	gtk_container_set_border_width (GTK_CONTAINER (openfilesdialog), 5);
+ 
+ 	vbox = gtk_dialog_get_content_area (GTK_DIALOG (openfilesdialog));
+diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
+index 4c814a0..398e68f 100644
+--- a/src/procdialogs.cpp
++++ b/src/procdialogs.cpp
+@@ -178,7 +178,7 @@ procdialog_create_renice_dialog (ProcData *procdata)
+ 				              NULL);
+   	renice_dialog = dialog;
+ 	gtk_window_set_resizable (GTK_WINDOW (renice_dialog), FALSE);
+-	gtk_dialog_set_has_separator (GTK_DIALOG (renice_dialog), FALSE);
++	g_object_set (G_OBJECT (renice_dialog), "has-separator", FALSE, NULL);
+ 	gtk_container_set_border_width (GTK_CONTAINER (renice_dialog), 5);
+   	
+ 	button = gtk_button_new ();
+@@ -510,7 +510,7 @@ procdialog_create_preferences_dialog (ProcData *procdata)
+ 	/* any function to set list height by contents/items inside it. */
+ 	gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 420);
+ 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++	g_object_set (G_OBJECT (dialog), "has-separator", FALSE, NULL);
+ 	prefs_dialog = dialog;
+ 	
+ 	main_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/005-replace-gdk_drawable.patch b/main/gnome-system-monitor/005-replace-gdk_drawable.patch
new file mode 100644
index 0000000000..c70f2d2072
--- /dev/null
+++ b/main/gnome-system-monitor/005-replace-gdk_drawable.patch
@@ -0,0 +1,56 @@
+From ff00bed20c1740b619a487c76d2a7671dd435cc9 Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Thu, 27 Jan 2011 01:08:37 +0000
+Subject: Replaced use of gdk_drawable_get_size with gdk_window_get_[width|height]
+
+---
+diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c
+index 01f162e..ef7b3de 100644
+--- a/src/gsm_color_button.c
++++ b/src/gsm_color_button.c
+@@ -287,7 +287,8 @@ render (GtkWidget * widget)
+       color->green = color->green + highlight_factor;
+   }
+   gdk_cairo_set_source_color (cr, color);
+-  gdk_drawable_get_size (gtk_widget_get_window (widget), &width, &height);
++  width  = gdk_window_get_width (gtk_widget_get_window (widget));
++  height = gdk_window_get_height(gtk_widget_get_window (widget));
+ 
+   switch (color_button->priv->type)
+     {
+diff --git a/src/procman.cpp b/src/procman.cpp
+index b5c0d0a..c9a5ac5 100644
+--- a/src/procman.cpp
++++ b/src/procman.cpp
+@@ -548,25 +548,20 @@ void
+ procman_save_config (ProcData *data)
+ {
+ 	GConfClient *client = data->client;
+-	gint width, height;
+ 
+ 	g_assert(data);
+ 		
+ 	procman_save_tree_state (data->client, data->tree, "/apps/procman/proctree");
+ 	procman_save_tree_state (data->client, data->disk_list, "/apps/procman/disktreenew");
+-		
+-	gdk_drawable_get_size (gtk_widget_get_window (data->app), &width, &height);
+-	data->config.width = width;
+-	data->config.height = height;
+-	
++
++	data->config.width  = gdk_window_get_width (gtk_widget_get_window (data->app));
++	data->config.height = gdk_window_get_height(gtk_widget_get_window (data->app));
++
+ 	gconf_client_set_int (client, "/apps/procman/width", data->config.width, NULL);
+ 	gconf_client_set_int (client, "/apps/procman/height", data->config.height, NULL);	
+ 	gconf_client_set_int (client, "/apps/procman/current_tab", data->config.current_tab, NULL);
+ 
+ 	gconf_client_suggest_sync (client, NULL);
+-	
+-
+-	
+ }
+ 
+ static guint32
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/006-fix-includes.patch b/main/gnome-system-monitor/006-fix-includes.patch
new file mode 100644
index 0000000000..0f5c957a45
--- /dev/null
+++ b/main/gnome-system-monitor/006-fix-includes.patch
@@ -0,0 +1,86 @@
+From c90b91acfc6880d16c5c991ea455ecbfbfe6fdab Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Thu, 27 Jan 2011 10:42:19 +0000
+Subject: Fixed includes flagged with *_DISABLE_SINGLE_INCLUDES
+
+---
+diff --git a/src/interface.h b/src/interface.h
+index 4bda35a..b26b670 100644
+--- a/src/interface.h
++++ b/src/interface.h
+@@ -20,7 +20,7 @@
+ #ifndef _PROCMAN_INTERFACE_H_
+ #define _PROCMAN_INTERFACE_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include "procman.h"
+ 
+diff --git a/src/load-graph.h b/src/load-graph.h
+index 2dc2b10..9dd28bb 100644
+--- a/src/load-graph.h
++++ b/src/load-graph.h
+@@ -1,7 +1,7 @@
+ #ifndef _PROCMAN_LOAD_GRAPH_H_
+ #define _PROCMAN_LOAD_GRAPH_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ 
+ enum
+diff --git a/src/lsof.h b/src/lsof.h
+index ad7f111..da420e2 100644
+--- a/src/lsof.h
++++ b/src/lsof.h
+@@ -1,7 +1,7 @@
+ #ifndef H_PROCMAN_LSOF_1161179202
+ #define H_PROCMAN_LSOF_1161179202
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "procman.h"
+ 
+ void procman_lsof(ProcData *data);
+diff --git a/src/openfiles.h b/src/openfiles.h
+index 38b1cc8..a8b7b05 100644
+--- a/src/openfiles.h
++++ b/src/openfiles.h
+@@ -1,7 +1,7 @@
+ #ifndef _OPENFILES_H_
+ #define _OPENFILES_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "procman.h"
+ 
+diff --git a/src/procman_gnomesu.h b/src/procman_gnomesu.h
+index fec2650..474ca9a 100644
+--- a/src/procman_gnomesu.h
++++ b/src/procman_gnomesu.h
+@@ -1,7 +1,7 @@
+ #ifndef H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917
+ #define H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ gboolean
+ procman_gnomesu_create_root_password_dialog(const char * message);
+diff --git a/src/util.cpp b/src/util.cpp
+index 9b1c9f5..90073fe 100644
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -1,7 +1,7 @@
+ #include <config.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <glibtop/proctime.h>
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/007-deprecated-gconf_init.patch b/main/gnome-system-monitor/007-deprecated-gconf_init.patch
new file mode 100644
index 0000000000..beb52e0016
--- /dev/null
+++ b/main/gnome-system-monitor/007-deprecated-gconf_init.patch
@@ -0,0 +1,23 @@
+From 94636329cba97708f245f678ca0b85fec7f3d819 Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Thu, 27 Jan 2011 10:55:10 +0000
+Subject: Removed use of deprecated gconf_init.
+
+---
+diff --git a/src/procman.cpp b/src/procman.cpp
+index c9a5ac5..19c4cbc 100644
+--- a/src/procman.cpp
++++ b/src/procman.cpp
+@@ -717,9 +717,7 @@ main (int argc, char *argv[])
+ 
+ 	gtk_window_set_default_icon_name ("utilities-system-monitor");
+ 	g_set_application_name(_("System Monitor"));
+-		    
+-	gconf_init (argc, argv, NULL);
+-			    
++
+ 	client = gconf_client_get_default ();
+ 	gconf_client_add_dir(client, "/apps/procman", GCONF_CLIENT_PRELOAD_NONE, NULL);
+ 
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/008-rsvg-fix.patch b/main/gnome-system-monitor/008-rsvg-fix.patch
new file mode 100644
index 0000000000..9bad7152ac
--- /dev/null
+++ b/main/gnome-system-monitor/008-rsvg-fix.patch
@@ -0,0 +1,54 @@
+From 7c700dd09c30e866fd3e358388d6a518f417b41c Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Thu, 27 Jan 2011 14:20:45 +0000
+Subject: Moved rsvg_init and rsvg_term into main to fix Bug #613752.
+
+---
+diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c
+index ef7b3de..e829694 100644
+--- a/src/gsm_color_button.c
++++ b/src/gsm_color_button.c
+@@ -595,8 +595,6 @@ gsm_color_button_init (GSMColorButton * color_button)
+ {
+   color_button->priv = GSM_COLOR_BUTTON_GET_PRIVATE (color_button);
+ 
+-  rsvg_init ();
+-
+   color_button->priv->color.red = 0;
+   color_button->priv->color.green = 0;
+   color_button->priv->color.blue = 0;
+@@ -645,7 +643,6 @@ gsm_color_button_finalize (GObject * object)
+   cairo_surface_destroy (color_button->priv->image_buffer);
+   color_button->priv->image_buffer = NULL;
+ 
+-  rsvg_term ();
+   G_OBJECT_CLASS (gsm_color_button_parent_class)->finalize (object);
+ }
+ 
+diff --git a/src/procman.cpp b/src/procman.cpp
+index 19c4cbc..f20de72 100644
+--- a/src/procman.cpp
++++ b/src/procman.cpp
+@@ -715,6 +715,9 @@ main (int argc, char *argv[])
+ 		exit (0);
+ 	}
+ 
++	/* initialize rsvg */
++	rsvg_init ();
++
+ 	gtk_window_set_default_icon_name ("utilities-system-monitor");
+ 	g_set_application_name(_("System Monitor"));
+ 
+@@ -753,6 +756,10 @@ main (int argc, char *argv[])
+ 
+ 	glibtop_close ();
+ 
++	// This function should only be called just before program exit.
++	// See GNOME bug #592100 for a discussion about this.
++	rsvg_term ();
++
+ 	return 0;
+ }
+ 
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/009-add-close-button.patch b/main/gnome-system-monitor/009-add-close-button.patch
new file mode 100644
index 0000000000..7aa47209e8
--- /dev/null
+++ b/main/gnome-system-monitor/009-add-close-button.patch
@@ -0,0 +1,79 @@
+From 00eb83fdbc5a6b6d5369b59b00a13293b1981b4f Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Wed, 02 Mar 2011 23:00:58 +0000
+Subject: Added close button to memory map dialog.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=592758
+---
+diff --git a/src/memmaps.cpp b/src/memmaps.cpp
+index 67255d1..ae8ef1c 100644
+--- a/src/memmaps.cpp
++++ b/src/memmaps.cpp
+@@ -316,14 +316,15 @@ update_memmaps_dialog (MemMapsData *mmdata)
+ 
+ 
+ 
+-static gboolean window_delete_event(GtkWidget *, GdkEvent *, gpointer data)
++static void
++dialog_response (GtkDialog * dialog, gint response_id, gpointer data)
+ {
+ 	MemMapsData * const mmdata = static_cast<MemMapsData*>(data);
+ 
+ 	g_source_remove (mmdata->timer);
+ 
+ 	delete mmdata;
+-	return FALSE;
++        gtk_widget_destroy (GTK_WIDGET (dialog));
+ }
+ 
+ 
+@@ -463,26 +464,16 @@ create_single_memmaps_dialog (GtkTreeModel *model, GtkTreePath *path,
+ 	mmdata = create_memmapsdata (procdata);
+ 	mmdata->info = info;
+ 
+-	memmapsdialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+-	gtk_window_set_transient_for(GTK_WINDOW(memmapsdialog), GTK_WINDOW(procdata->app));
+-	gtk_window_set_destroy_with_parent(GTK_WINDOW(memmapsdialog), TRUE);
+-	// gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+-	gtk_window_set_title(GTK_WINDOW(memmapsdialog), _("Memory Maps"));
++        memmapsdialog = gtk_dialog_new_with_buttons (_("Memory Maps"), GTK_WINDOW (procdata->app),
++                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
++                                                     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
++                                                     NULL);
+ 	gtk_window_set_resizable(GTK_WINDOW(memmapsdialog), TRUE);
+ 	gtk_window_set_default_size(GTK_WINDOW(memmapsdialog), 575, 400);
+-	gtk_container_set_border_width(GTK_CONTAINER(memmapsdialog), 12);
+-
+-	GtkWidget *mainbox = gtk_vbox_new(FALSE, 12);
+-	gtk_container_add(GTK_CONTAINER(memmapsdialog), mainbox);
+-
+-	vbox = mainbox;
+-	gtk_box_set_spacing (GTK_BOX (vbox), 2);
+-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
++	gtk_container_set_border_width(GTK_CONTAINER(memmapsdialog), 5);
+ 
+-	dialog_vbox = gtk_vbox_new (FALSE, 6);
++	dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG(memmapsdialog));
+ 	gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
+-	gtk_box_pack_start (GTK_BOX (vbox), dialog_vbox, TRUE, TRUE, 0);
+-
+ 
+ 	label = procman_make_label_for_mmaps_or_ofiles (
+ 		_("_Memory maps for process \"%s\" (PID %u):"),
+@@ -504,11 +495,10 @@ create_single_memmaps_dialog (GtkTreeModel *model, GtkTreePath *path,
+ 
+ 	gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolled, TRUE, TRUE, 0);
+ 
+-	gtk_widget_show_all (memmapsdialog);
+-
+-	g_signal_connect(G_OBJECT(memmapsdialog), "delete-event",
+-			 G_CALLBACK(window_delete_event), mmdata);
++	g_signal_connect(G_OBJECT(memmapsdialog), "response",
++			 G_CALLBACK(dialog_response), mmdata);
+ 
++        gtk_widget_show_all (memmapsdialog);
+ 	mmdata->timer = g_timeout_add_seconds (5, memmaps_timer, mmdata);
+ 
+ 	update_memmaps_dialog (mmdata);
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/010-cpu-model-arm.patch b/main/gnome-system-monitor/010-cpu-model-arm.patch
new file mode 100644
index 0000000000..c5c4a65ab2
--- /dev/null
+++ b/main/gnome-system-monitor/010-cpu-model-arm.patch
@@ -0,0 +1,22 @@
+From a84ed33fb4c313d7cf67fac791aa063a997cb3af Mon Sep 17 00:00:00 2001
+From: Debbie Beliveau <debbie.beliveau@canonical.com>
+Date: Thu, 03 Mar 2011 19:55:44 +0000
+Subject: Fix to show cpu model on ARM.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=606769
+---
+diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp
+index 5f28e0c..20c94b0 100644
+--- a/src/sysinfo.cpp
++++ b/src/sysinfo.cpp
+@@ -105,7 +105,7 @@ namespace {
+       const glibtop_sysinfo *info = glibtop_get_sysinfo();
+ 
+       for (guint i = 0; i != info->ncpu; ++i) {
+-	const char * const keys[] = { "model name", "cpu" };
++	const char * const keys[] = { "model name", "cpu", "Processor" };
+ 	gchar *model = 0;
+ 
+ 	for (guint j = 0; !model && j != G_N_ELEMENTS(keys); ++j)
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/011-max-nice-linux.patch b/main/gnome-system-monitor/011-max-nice-linux.patch
new file mode 100644
index 0000000000..55d4e4110d
--- /dev/null
+++ b/main/gnome-system-monitor/011-max-nice-linux.patch
@@ -0,0 +1,21 @@
+From 7c493352b24fb6d0d8b003f25043b070244eeb2e Mon Sep 17 00:00:00 2001
+From: Chris Kühl <chrisk@openismus.com>
+Date: Fri, 15 Apr 2011 09:18:10 +0000
+Subject: Make maximum nice value 19 instead of 20 on Linux.
+
+---
+diff --git a/src/procdialogs.h b/src/procdialogs.h
+index eba3212..61decf8 100644
+--- a/src/procdialogs.h
++++ b/src/procdialogs.h
+@@ -26,7 +26,7 @@
+ /* These are the actual range of settable values. Values outside this range
+    are scaled back to these limits. So show these limits in the slider
+ */
+-#ifdef linux
++#ifdef __linux__
+ #define RENICE_VAL_MIN -20
+ #define RENICE_VAL_MAX 19
+ #else /* ! linux */
+--
+cgit v0.9
diff --git a/main/gnome-system-monitor/APKBUILD b/main/gnome-system-monitor/APKBUILD
index 5419b692ca..5c6a4ced46 100644
--- a/main/gnome-system-monitor/APKBUILD
+++ b/main/gnome-system-monitor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnome-system-monitor
 pkgver=2.28.2
-pkgrel=0
+pkgrel=3
 pkgdesc="GNOME system monitor"
 url="http://www.gnome.org"
 arch="all"
@@ -34,8 +34,20 @@ depends_dev="gtk+-dev
 	     glibmm-dev"
 makedepends="$depends_dev intltool gobject-introspection-dev desktop-file-utils gnome-icon-theme"
 install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages=
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-lang"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+001-duplicate-label.patch
+002-replace-gtknotebookpage.patch
+003-replace-old-drawing.patch
+004-replace-dialog-set.patch
+005-replace-gdk_drawable.patch
+006-fix-includes.patch
+007-deprecated-gconf_init.patch
+008-rsvg-fix.patch
+009-add-close-button.patch
+010-cpu-model-arm.patch
+011-max-nice-linux.patch
+"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -63,4 +75,15 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="3f0bca9b0ebc7a365466851cd580d167  gnome-system-monitor-2.28.2.tar.bz2"
+md5sums="3f0bca9b0ebc7a365466851cd580d167  gnome-system-monitor-2.28.2.tar.bz2
+c13e170cc9f420cfe910bb4d9b262c73  001-duplicate-label.patch
+3d4a0f8703322ab7ae905480476ec0b8  002-replace-gtknotebookpage.patch
+da523fdfb5973530c65004d7efb6bb07  003-replace-old-drawing.patch
+08a6a43c1475f919bddb7c8ab80f2b8a  004-replace-dialog-set.patch
+cfbed825106e8ab50ec4ee2e7bc3ddab  005-replace-gdk_drawable.patch
+444412a8e6022a77917a4d6c3bef40c1  006-fix-includes.patch
+a30694c6790c06336b81ac86b8c3f494  007-deprecated-gconf_init.patch
+4e653f81b534753b995e6587e470bda8  008-rsvg-fix.patch
+cd900e83ba75892979ad32c2c7779724  009-add-close-button.patch
+674e96dd3967fda8a26acbcf719b8914  010-cpu-model-arm.patch
+6ffce80f40adeb53862762a55b638c18  011-max-nice-linux.patch"