Update to 2.11.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4007 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 20 insertions, 412 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 08722863a..828e46e8f 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTVERSION=	2.11.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.10
+MASTER_SITE_SUBDIR=	sources/control-center/2.11
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 1c42a8a89..ba7d0edf2 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.10.1.tar.bz2) = d95a5746aa349536dc0f59c61cdaf19f
-SIZE (gnome2/control-center-2.10.1.tar.bz2) = 2648247
+MD5 (gnome2/control-center-2.11.2.tar.bz2) = 232441b22aed13ae965cdd6a9027fc1e
+SIZE (gnome2/control-center-2.11.2.tar.bz2) = 2661046
diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
index 02374b23a..78449651b 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -1,33 +1,17 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
-@@ -242,21 +242,25 @@
-                                          Bool allowMultipleSelection,
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Sun May 22 22:57:24 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Sun May 22 22:58:27 2005
+@@ -243,11 +243,12 @@ xkb_options_add_group (const XklConfigIt
                                           GladeXML * dialog)
  {
+   GtkWidget *expander, *align, *vbox;
 +  gchar *utfGroupName, *titlemarkup;
-+  GtkWidget *expander;
-+  GtkWidget *vbox;
-+  GtkWidget *align;
-   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
  
-   current1stLevelId = configItem->name;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
  
 -  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
 -  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
 +  utfGroupName = xci_desc_to_utf8 (configItem);
 +  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
  
--  GtkWidget *expander = gtk_expander_new (titlemarkup);
-+  expander = gtk_expander_new (titlemarkup);
+   expander = gtk_expander_new (titlemarkup);
    g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
- 
-   g_free (titlemarkup);
-   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
--  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
-+  align = gtk_alignment_new (0, 0, 1, 1);
-   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
--  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
-+  vbox = gtk_vbox_new (TRUE, 6);
-   gtk_container_add (GTK_CONTAINER (align), vbox);
-   gtk_container_add (GTK_CONTAINER (expander), align);
-   currentVbox = vbox;
diff --git a/sysutils/gnome-control-center/files/patch-control-center_control-center-categories.c b/sysutils/gnome-control-center/files/patch-control-center_control-center-categories.c
deleted file mode 100644
index 78baf3c4b..000000000
--- a/sysutils/gnome-control-center/files/patch-control-center_control-center-categories.c
+++ /dev/null
@@ -1,179 +0,0 @@
---- control-center/control-center-categories.c	2005/02/03 21:59:49	1.5
-+++ control-center/control-center-categories.c	2005/05/02 08:05:27	1.9
-@@ -33,8 +33,8 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
--#define MENU_I_KNOW_THIS_IS_UNSTABLE
--#include <menu-tree.h>
-+#define GMENU_I_KNOW_THIS_IS_UNSTABLE
-+#include <gmenu-tree.h>
- 
- static char *
- remove_icon_suffix (const char *icon)
-@@ -87,17 +87,17 @@
- 
- static ControlCenterEntry *
- control_center_entry_new (ControlCenterCategory *category,
--			  MenuTreeEntry         *menu_entry)
-+			  GMenuTreeEntry        *menu_entry)
- {
- 	ControlCenterEntry *retval;
- 
- 	retval = g_new0 (ControlCenterEntry, 1);
- 
- 	retval->category      = category;
--	retval->title         = g_strdup (menu_tree_entry_get_name (menu_entry));
--	retval->comment       = g_strdup (menu_tree_entry_get_comment (menu_entry));
--	retval->desktop_entry = g_strdup (menu_tree_entry_get_desktop_file_path (menu_entry));
--	retval->icon_pixbuf   = load_icon (menu_tree_entry_get_icon (menu_entry));
-+	retval->title         = g_strdup (gmenu_tree_entry_get_name (menu_entry));
-+	retval->comment       = g_strdup (gmenu_tree_entry_get_comment (menu_entry));
-+	retval->desktop_entry = g_strdup (gmenu_tree_entry_get_desktop_file_path (menu_entry));
-+	retval->icon_pixbuf   = load_icon (gmenu_tree_entry_get_icon (menu_entry));
- 
- 	return retval;
- }
-@@ -125,25 +125,27 @@
- 
- static void
- populate_category (ControlCenterCategory *category,
--		   MenuTreeDirectory     *menu_directory)
-+		   GMenuTreeDirectory    *menu_directory)
- {
--	GSList *menu_entries;
-+	GSList *items;
- 	GSList *entries;
- 	GSList *l;
- 
- 	entries = NULL;
- 
--	menu_entries = menu_tree_directory_get_entries (menu_directory);
--	for (l = menu_entries; l; l = l->next) {
--		MenuTreeEntry *menu_entry = l->data;
-+	items = gmenu_tree_directory_get_contents (menu_directory);
-+	for (l = items; l; l = l->next) {
-+		GMenuTreeItem *item = l->data;
-+
-+		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_ENTRY)
-+			entries = g_slist_append (entries,
-+						  control_center_entry_new (category,
-+									    GMENU_TREE_ENTRY (item)));
- 
--		entries = g_slist_prepend (entries,
--					   control_center_entry_new (category, menu_entry));
--
--		menu_tree_entry_unref (menu_entry);
-+		gmenu_tree_item_unref (item);
- 	}
- 
--	g_slist_free (menu_entries);
-+	g_slist_free (items);
- 
- 	if (entries != NULL) {
- 		GSList *l;
-@@ -160,15 +162,15 @@
- }
- 
- static ControlCenterCategory *
--control_center_category_new (MenuTreeDirectory *menu_directory,
--			     const char        *title,
--			     gboolean           real_category)
-+control_center_category_new (GMenuTreeDirectory *menu_directory,
-+			     const char         *title,
-+			     gboolean            real_category)
- {
- 	ControlCenterCategory *retval;
- 
- 	retval = g_new0 (ControlCenterCategory, 1);
- 
--	retval->title         = g_strdup (title ? title : menu_tree_directory_get_name (menu_directory));
-+	retval->title         = g_strdup (title ? title : gmenu_tree_directory_get_name (menu_directory));
- 	retval->real_category = real_category != FALSE;
- 
- 	populate_category (retval, menu_directory);
-@@ -193,25 +195,31 @@
- }
- 
- static GSList *
--read_categories_from_menu_directory (MenuTreeDirectory *directory,
--				     GSList            *categories)
-+read_categories_from_menu_directory (GMenuTreeDirectory *directory,
-+				     GSList             *categories)
- {
--	GSList *subdirs;
-+	GSList *items;
- 	GSList *l;
- 
--	subdirs = menu_tree_directory_get_subdirs (directory);
--	for (l = subdirs; l; l = l->next) {
--		MenuTreeDirectory *subdir = l->data;
-+	items = gmenu_tree_directory_get_contents (directory);
-+	for (l = items; l; l = l->next) {
-+		GMenuTreeItem *item = l->data;
-+
-+		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_DIRECTORY) {
-+			GMenuTreeDirectory *subdir;
- 
--		categories = g_slist_prepend (categories,
--					      control_center_category_new (subdir, NULL, TRUE));
-+			subdir = GMENU_TREE_DIRECTORY (item);
- 
--		categories = read_categories_from_menu_directory (subdir, categories);
-+			categories = g_slist_prepend (categories,
-+						      control_center_category_new (subdir, NULL, TRUE));
-+
-+			categories = read_categories_from_menu_directory (subdir, categories);
-+		}
- 
--		menu_tree_directory_unref (subdir);
-+		gmenu_tree_item_unref (item);
- 	}
- 
--	g_slist_free (subdirs);
-+	g_slist_free (items);
- 
- 	return categories;
- }
-@@ -227,17 +235,17 @@
- control_center_get_information (void)
- {
- 	ControlCenterInformation *information;
--	MenuTree                 *menu_tree;
--	MenuTreeDirectory        *menu_root;
-+	GMenuTree                *menu_tree;
-+	GMenuTreeDirectory       *menu_root;
- 	GSList                   *categories;
- 	GSList                   *prev, *curr;
- 
- 	information = g_new0 (ControlCenterInformation, 1);
- 
--	menu_tree = menu_tree_lookup ("preferences.menu");
-+	menu_tree = gmenu_tree_lookup ("preferences.menu", GMENU_TREE_FLAGS_NONE);
- 
--	if (!(menu_root = menu_tree_get_root_directory (menu_tree))) {
--		menu_tree_unref (menu_tree);
-+	if (!(menu_root = gmenu_tree_get_root_directory (menu_tree))) {
-+		gmenu_tree_unref (menu_tree);
- 		return information;
- 	}
- 
-@@ -257,7 +265,7 @@
- 		}
- 	}
- 
--	menu_tree_directory_unref (menu_root);
-+	gmenu_tree_item_unref (menu_root);
- 
- 	if (categories != NULL) {
- 		GSList *l;
-@@ -272,7 +280,7 @@
- 		g_slist_free (categories);
- 	}
- 
--	menu_tree_unref (menu_tree);
-+	gmenu_tree_unref (menu_tree);
- 
- 	return information;
- }
-
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 08722863a..828e46e8f 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTVERSION=	2.11.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.10
+MASTER_SITE_SUBDIR=	sources/control-center/2.11
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 1c42a8a89..ba7d0edf2 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.10.1.tar.bz2) = d95a5746aa349536dc0f59c61cdaf19f
-SIZE (gnome2/control-center-2.10.1.tar.bz2) = 2648247
+MD5 (gnome2/control-center-2.11.2.tar.bz2) = 232441b22aed13ae965cdd6a9027fc1e
+SIZE (gnome2/control-center-2.11.2.tar.bz2) = 2661046
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
index 02374b23a..78449651b 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -1,33 +1,17 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
-@@ -242,21 +242,25 @@
-                                          Bool allowMultipleSelection,
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Sun May 22 22:57:24 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Sun May 22 22:58:27 2005
+@@ -243,11 +243,12 @@ xkb_options_add_group (const XklConfigIt
                                           GladeXML * dialog)
  {
+   GtkWidget *expander, *align, *vbox;
 +  gchar *utfGroupName, *titlemarkup;
-+  GtkWidget *expander;
-+  GtkWidget *vbox;
-+  GtkWidget *align;
-   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
  
-   current1stLevelId = configItem->name;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
  
 -  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
 -  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
 +  utfGroupName = xci_desc_to_utf8 (configItem);
 +  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
  
--  GtkWidget *expander = gtk_expander_new (titlemarkup);
-+  expander = gtk_expander_new (titlemarkup);
+   expander = gtk_expander_new (titlemarkup);
    g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
- 
-   g_free (titlemarkup);
-   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
--  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
-+  align = gtk_alignment_new (0, 0, 1, 1);
-   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
--  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
-+  vbox = gtk_vbox_new (TRUE, 6);
-   gtk_container_add (GTK_CONTAINER (align), vbox);
-   gtk_container_add (GTK_CONTAINER (expander), align);
-   currentVbox = vbox;
diff --git a/sysutils/gnomecontrolcenter2/files/patch-control-center_control-center-categories.c b/sysutils/gnomecontrolcenter2/files/patch-control-center_control-center-categories.c
deleted file mode 100644
index 78baf3c4b..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-control-center_control-center-categories.c
+++ /dev/null
@@ -1,179 +0,0 @@
---- control-center/control-center-categories.c	2005/02/03 21:59:49	1.5
-+++ control-center/control-center-categories.c	2005/05/02 08:05:27	1.9
-@@ -33,8 +33,8 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
--#define MENU_I_KNOW_THIS_IS_UNSTABLE
--#include <menu-tree.h>
-+#define GMENU_I_KNOW_THIS_IS_UNSTABLE
-+#include <gmenu-tree.h>
- 
- static char *
- remove_icon_suffix (const char *icon)
-@@ -87,17 +87,17 @@
- 
- static ControlCenterEntry *
- control_center_entry_new (ControlCenterCategory *category,
--			  MenuTreeEntry         *menu_entry)
-+			  GMenuTreeEntry        *menu_entry)
- {
- 	ControlCenterEntry *retval;
- 
- 	retval = g_new0 (ControlCenterEntry, 1);
- 
- 	retval->category      = category;
--	retval->title         = g_strdup (menu_tree_entry_get_name (menu_entry));
--	retval->comment       = g_strdup (menu_tree_entry_get_comment (menu_entry));
--	retval->desktop_entry = g_strdup (menu_tree_entry_get_desktop_file_path (menu_entry));
--	retval->icon_pixbuf   = load_icon (menu_tree_entry_get_icon (menu_entry));
-+	retval->title         = g_strdup (gmenu_tree_entry_get_name (menu_entry));
-+	retval->comment       = g_strdup (gmenu_tree_entry_get_comment (menu_entry));
-+	retval->desktop_entry = g_strdup (gmenu_tree_entry_get_desktop_file_path (menu_entry));
-+	retval->icon_pixbuf   = load_icon (gmenu_tree_entry_get_icon (menu_entry));
- 
- 	return retval;
- }
-@@ -125,25 +125,27 @@
- 
- static void
- populate_category (ControlCenterCategory *category,
--		   MenuTreeDirectory     *menu_directory)
-+		   GMenuTreeDirectory    *menu_directory)
- {
--	GSList *menu_entries;
-+	GSList *items;
- 	GSList *entries;
- 	GSList *l;
- 
- 	entries = NULL;
- 
--	menu_entries = menu_tree_directory_get_entries (menu_directory);
--	for (l = menu_entries; l; l = l->next) {
--		MenuTreeEntry *menu_entry = l->data;
-+	items = gmenu_tree_directory_get_contents (menu_directory);
-+	for (l = items; l; l = l->next) {
-+		GMenuTreeItem *item = l->data;
-+
-+		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_ENTRY)
-+			entries = g_slist_append (entries,
-+						  control_center_entry_new (category,
-+									    GMENU_TREE_ENTRY (item)));
- 
--		entries = g_slist_prepend (entries,
--					   control_center_entry_new (category, menu_entry));
--
--		menu_tree_entry_unref (menu_entry);
-+		gmenu_tree_item_unref (item);
- 	}
- 
--	g_slist_free (menu_entries);
-+	g_slist_free (items);
- 
- 	if (entries != NULL) {
- 		GSList *l;
-@@ -160,15 +162,15 @@
- }
- 
- static ControlCenterCategory *
--control_center_category_new (MenuTreeDirectory *menu_directory,
--			     const char        *title,
--			     gboolean           real_category)
-+control_center_category_new (GMenuTreeDirectory *menu_directory,
-+			     const char         *title,
-+			     gboolean            real_category)
- {
- 	ControlCenterCategory *retval;
- 
- 	retval = g_new0 (ControlCenterCategory, 1);
- 
--	retval->title         = g_strdup (title ? title : menu_tree_directory_get_name (menu_directory));
-+	retval->title         = g_strdup (title ? title : gmenu_tree_directory_get_name (menu_directory));
- 	retval->real_category = real_category != FALSE;
- 
- 	populate_category (retval, menu_directory);
-@@ -193,25 +195,31 @@
- }
- 
- static GSList *
--read_categories_from_menu_directory (MenuTreeDirectory *directory,
--				     GSList            *categories)
-+read_categories_from_menu_directory (GMenuTreeDirectory *directory,
-+				     GSList             *categories)
- {
--	GSList *subdirs;
-+	GSList *items;
- 	GSList *l;
- 
--	subdirs = menu_tree_directory_get_subdirs (directory);
--	for (l = subdirs; l; l = l->next) {
--		MenuTreeDirectory *subdir = l->data;
-+	items = gmenu_tree_directory_get_contents (directory);
-+	for (l = items; l; l = l->next) {
-+		GMenuTreeItem *item = l->data;
-+
-+		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_DIRECTORY) {
-+			GMenuTreeDirectory *subdir;
- 
--		categories = g_slist_prepend (categories,
--					      control_center_category_new (subdir, NULL, TRUE));
-+			subdir = GMENU_TREE_DIRECTORY (item);
- 
--		categories = read_categories_from_menu_directory (subdir, categories);
-+			categories = g_slist_prepend (categories,
-+						      control_center_category_new (subdir, NULL, TRUE));
-+
-+			categories = read_categories_from_menu_directory (subdir, categories);
-+		}
- 
--		menu_tree_directory_unref (subdir);
-+		gmenu_tree_item_unref (item);
- 	}
- 
--	g_slist_free (subdirs);
-+	g_slist_free (items);
- 
- 	return categories;
- }
-@@ -227,17 +235,17 @@
- control_center_get_information (void)
- {
- 	ControlCenterInformation *information;
--	MenuTree                 *menu_tree;
--	MenuTreeDirectory        *menu_root;
-+	GMenuTree                *menu_tree;
-+	GMenuTreeDirectory       *menu_root;
- 	GSList                   *categories;
- 	GSList                   *prev, *curr;
- 
- 	information = g_new0 (ControlCenterInformation, 1);
- 
--	menu_tree = menu_tree_lookup ("preferences.menu");
-+	menu_tree = gmenu_tree_lookup ("preferences.menu", GMENU_TREE_FLAGS_NONE);
- 
--	if (!(menu_root = menu_tree_get_root_directory (menu_tree))) {
--		menu_tree_unref (menu_tree);
-+	if (!(menu_root = gmenu_tree_get_root_directory (menu_tree))) {
-+		gmenu_tree_unref (menu_tree);
- 		return information;
- 	}
- 
-@@ -257,7 +265,7 @@
- 		}
- 	}
- 
--	menu_tree_directory_unref (menu_root);
-+	gmenu_tree_item_unref (menu_root);
- 
- 	if (categories != NULL) {
- 		GSList *l;
-@@ -272,7 +280,7 @@
- 		g_slist_free (categories);
- 	}
- 
--	menu_tree_unref (menu_tree);
-+	gmenu_tree_unref (menu_tree);
- 
- 	return information;
- }
-