Update to 2.19.5

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

4 files changed, 52 insertions, 148 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index b5602cf3b..e8442f52f 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.144 2007/07/02 07:19:04 marcus Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.145 2007/07/02 07:59:38 marcus Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.19.4
-PORTREVISION=	4
+PORTVERSION=	2.19.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index cdd70c57f..9fc44465b 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.19.4.tar.bz2) = 69ce15012bb9bc49af84c4d7e2584821
-SHA256 (gnome2/gnome-control-center-2.19.4.tar.bz2) = 51b591ab0498b01682147933ec1c8c1f4df40f0294ccfeff6d4ee24294af8ccd
-SIZE (gnome2/gnome-control-center-2.19.4.tar.bz2) = 2154522
+MD5 (gnome2/gnome-control-center-2.19.5.tar.bz2) = 252aded52a41e2fdc398a8e339e1a546
+SHA256 (gnome2/gnome-control-center-2.19.5.tar.bz2) = 9397d084bacf1facf34a98899707c789152fb8714bba8c43a53a9c5065bf2e9d
+SIZE (gnome2/gnome-control-center-2.19.5.tar.bz2) = 2216741
diff --git a/sysutils/gnome-control-center/files/patch-svn_fix_gsd b/sysutils/gnome-control-center/files/patch-svn_fix_gsd
deleted file mode 100644
index e2609a272..000000000
--- a/sysutils/gnome-control-center/files/patch-svn_fix_gsd
+++ /dev/null
@@ -1,116 +0,0 @@
---- gnome-settings-daemon/gnome-settings-screensaver.c.orig	2007-06-25 11:56:47.000000000 -0400
-+++ gnome-settings-daemon/gnome-settings-screensaver.c	2007-06-25 11:57:10.000000000 -0400
-@@ -173,7 +173,7 @@ gnome_settings_module_screensaver_start 
- 		return FALSE;
- 	args[2] = NULL;
- 
--	if (g_spawn_async (g_get_home_dir (), args, NULL, 0, NULL, NULL, &module_ss->screensaver_pid, &gerr))
-+	if (g_spawn_async (g_get_home_dir (), args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &module_ss->screensaver_pid, &gerr))
- 		return TRUE;
- 
- 	show_error = gconf_client_get_bool (gnome_settings_module_get_config_client (module),
---- gnome-settings-daemon/gnome-settings-daemon.c	2007/06/18 20:50:39	7747
-+++ gnome-settings-daemon/gnome-settings-daemon.c	2007/06/20 11:07:32	7753
-@@ -62,23 +62,6 @@
- XSettingsManager **managers = NULL;
- 
- static void
--debug_warning (const char *msg, ...)
--{
--	va_list args;
--	gchar *str;
--	GtkWidget *dialog;
--
--	va_start (args, msg);
--	str = g_strdup_vprintf (msg, args);
--	va_end (args);
--
--	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, str);
--	gnome_settings_delayed_show_dialog (dialog);
--
--	g_free (str);
--}
--
--static void
- terminate_cb (void *data)
- {
- 	gboolean *terminated = data;
-@@ -125,9 +108,9 @@
- 	client = gnome_settings_get_config_client ();
- 
- 	module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel);
--	for (l = module_list; l != NULL; l = l->next) {
--		
--		gnome_settings_module_initialize (GNOME_SETTINGS_MODULE (l->data), client);
-+	for (l = module_list; l != NULL; l = l->next) {		
-+		if (!gnome_settings_module_initialize (GNOME_SETTINGS_MODULE (l->data), client))
-+			g_warning ("Module %s could not be initialized", G_OBJECT_TYPE_NAME (G_OBJECT (l->data)));
- 	}
- }
- 
-@@ -137,8 +120,10 @@
- 	GList *l, *module_list;
- 
- 	module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel);
--	for (l = module_list; l != NULL; l = l->next)
--		gnome_settings_module_start (GNOME_SETTINGS_MODULE (l->data));
-+	for (l = module_list; l != NULL; l = l->next) {
-+		if (!gnome_settings_module_start (GNOME_SETTINGS_MODULE (l->data)))
-+			g_warning ("Module %s could not be started", G_OBJECT_TYPE_NAME (G_OBJECT (l->data)));
-+	}
- }
- 
- static void
-@@ -215,7 +200,7 @@
- 		return;
- 
- 	/* create hash table for loaded modules */
--	settings->priv->loaded_modules = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, free_modules_list);
-+	settings->priv->loaded_modules = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, free_modules_list);
- 
- 	module_types = g_type_children (GNOME_SETTINGS_TYPE_MODULE, &n_children);
- 	if (module_types) {
-@@ -223,7 +208,7 @@
- 
- 		for (i = 0; i < n_children; i++) {
- 			GObject *module;
--			GnomeSettingsModuleRunlevel runlevel;
-+			GnomeSettingsModuleRunlevel runlevel, *ptr_runlevel;
- 			GList *module_list;
- 
- 			module = g_object_new (module_types[i], NULL);
-@@ -236,7 +221,9 @@
- 				module_list = g_list_append (module_list, module);
- 			else {
- 				module_list = g_list_append (NULL, module);
--				g_hash_table_insert (settings->priv->loaded_modules, &runlevel, module_list);
-+				ptr_runlevel = g_new0 (GnomeSettingsModuleRunlevel, 1);
-+				*ptr_runlevel = runlevel;
-+				g_hash_table_insert (settings->priv->loaded_modules, ptr_runlevel, module_list);
- 			}
- 		}
- 
---- gnome-settings-daemon/gnome-settings-module.c	2007/04/23 16:26:37	7485
-+++ gnome-settings-daemon/gnome-settings-module.c	2007/06/20 11:07:32	7753
-@@ -134,7 +134,9 @@
- {
- 	g_return_val_if_fail (GNOME_SETTINGS_IS_MODULE (module), FALSE);
- 	g_return_val_if_fail (module->priv->status == GNOME_SETTINGS_MODULE_STATUS_INITIALIZED, FALSE);
--	g_return_val_if_fail (CLASS (module)->start != NULL, FALSE);
-+
-+	if (!CLASS (module)->start)
-+		return TRUE;
- 
- 	if (CLASS (module)->start (module)) {
- 		module->priv->status = GNOME_SETTINGS_MODULE_STATUS_STARTED;
-@@ -149,7 +151,9 @@
- {
- 	g_return_val_if_fail (GNOME_SETTINGS_IS_MODULE (module), FALSE);
- 	g_return_val_if_fail (module->priv->status == GNOME_SETTINGS_MODULE_STATUS_STARTED, FALSE);
--	g_return_val_if_fail (CLASS (module)->stop != NULL, FALSE);
-+	
-+	if (!CLASS (module)->stop)
-+		return TRUE;
- 
- 	if (CLASS (module)->stop (module)) {
- 		module->priv->status = GNOME_SETTINGS_MODULE_STATUS_STOPPED;
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 4235ce2b6..a1044be1b 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -85,7 +85,6 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/glade/modmap-dialog.glade
 %%DATADIR%%/glade/sound-properties.glade
 %%DATADIR%%/gnome-default-applications.xml
-%%DATADIR%%/icons/display-capplet.png
 %%DATADIR%%/keybindings/00-multimedia-key.xml
 %%DATADIR%%/keybindings/01-desktop-key.xml
 %%DATADIR%%/pixmaps/accessibility-keyboard-bouncekey.png
@@ -105,6 +104,8 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/pixmaps/double-click-on.png
 %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
 %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
+%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
 %%DATADIR%%/pixmaps/keyboard-bell.png
 %%DATADIR%%/pixmaps/keyboard-cursor.png
 %%DATADIR%%/pixmaps/keyboard-repeat.png
@@ -123,6 +124,7 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/pixmaps/subpixel-vrgb.png
 %%DATADIR%%/pixmaps/theme-thumbnailing.png
 %%DATADIR%%/pixmaps/visual-bell.png
+%%DATADIR%%/pixmaps/window-theme-thumbnailing.png
 %%DATADIR%%/xrdb/Editres.ad
 %%DATADIR%%/xrdb/Emacs.ad
 %%DATADIR%%/xrdb/General.ad
@@ -152,11 +154,28 @@ share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
 share/gnome/help/control-center/pa/control-center.xml
+share/gnome/help/control-center/pt_BR/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
 share/gnome/help/control-center/uk/control-center.xml
+share/gnome/help/control-center/vi/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
+share/icons/hicolor/16x16/apps/gnome-display-properties.png
+share/icons/hicolor/16x16/apps/gnome-network-preferences.png
+share/icons/hicolor/16x16/apps/gnome-sound-properties.png
+share/icons/hicolor/22x22/apps/gnome-display-properties.png
+share/icons/hicolor/22x22/apps/gnome-network-preferences.png
+share/icons/hicolor/22x22/apps/gnome-sound-properties.png
+share/icons/hicolor/24x24/apps/gnome-display-properties.png
+share/icons/hicolor/24x24/apps/gnome-network-preferences.png
+share/icons/hicolor/24x24/apps/gnome-sound-properties.png
+share/icons/hicolor/32x32/apps/gnome-display-properties.png
+share/icons/hicolor/32x32/apps/gnome-network-preferences.png
+share/icons/hicolor/32x32/apps/gnome-sound-properties.png
 share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/gnome-display-properties.svg
+share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
+share/icons/hicolor/scalable/apps/gnome-sound-properties.svg
 share/icons/hicolor/scalable/apps/typing-monitor.svg
 share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -244,36 +263,13 @@ share/omf/control-center/control-center-en_GB.omf
 share/omf/control-center/control-center-es.omf
 share/omf/control-center/control-center-fr.omf
 share/omf/control-center/control-center-pa.omf
+share/omf/control-center/control-center-pt_BR.omf
 share/omf/control-center/control-center-ru.omf
 share/omf/control-center/control-center-sv.omf
 share/omf/control-center/control-center-uk.omf
+share/omf/control-center/control-center-vi.omf
 share/omf/control-center/control-center-zh_CN.omf
-share/pixmaps/display-capplet.png
 @dirrm share/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/uk
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/pa
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/en_GB
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/cursor-fonts
-@dirrm %%DATADIR%%/xrdb
-@dirrm %%DATADIR%%/pixmaps
-@dirrmtry %%DATADIR%%/icons
-@dirrm %%DATADIR%%/glade
-@dirrm share/desktop-directories
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -298,3 +294,28 @@ share/pixmaps/display-capplet.png
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/vi
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pt_BR
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/cursor-fonts
+@dirrm %%DATADIR%%/xrdb
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrm share/desktop-directories
+@dirrm lib/window-manager-settings
+@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true