Update to 2.13.2.

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

11 files changed, 8 insertions, 214 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 4a9619d00..a0262b7fb 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.66 2005/09/07 04:43:08 marcus Exp $
+#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.68 2005/12/12 21:53:01 ahze Exp $
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.13.0
+PORTVERSION=	2.13.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.13
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index a46115e54..50592588e 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.13.0.tar.bz2) = ffe4ce813e98823e580ab839045c2bdd
-SHA256 (gnome2/libgnomeui-2.13.0.tar.bz2) = ec6d26a7654d4b4ecd7b830c107adcc72738bc0598ccc5701f718c635ad2b1e3
-SIZE (gnome2/libgnomeui-2.13.0.tar.bz2) = 1807880
+MD5 (gnome2/libgnomeui-2.13.2.tar.bz2) = beee8d2e32ddb4b5647e8c5c950a42fa
+SHA256 (gnome2/libgnomeui-2.13.2.tar.bz2) = 8a7ad727510ab7a166747e33cee5071bdee70e828c12498d33a7ae0d1670f429
+SIZE (gnome2/libgnomeui-2.13.2.tar.bz2) = 1756391
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
deleted file mode 100644
index 87c3856f1..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- libgnomeui/gnome-app-helper.c.orig	Sun Mar 20 20:46:17 2005
-+++ libgnomeui/gnome-app-helper.c	Sun Mar 20 20:49:57 2005
-@@ -435,6 +435,8 @@
-                 new_setting = gconf_value_get_bool(value);
-         }
- 
-+	GDK_THREADS_ENTER();
-+
-         if (new_setting && (mi->image == NULL)) {
-                 GtkWidget *pixmap;
-                 GnomeUIPixmapType pixmap_type;
-@@ -457,6 +459,8 @@
-         } else if (!new_setting && (mi->image != NULL)) {
- 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), NULL);
-         }
-+
-+	GDK_THREADS_LEAVE();
- }
- 
- /* Note that this function is also used for toolbars, don't assume
-@@ -1320,6 +1324,8 @@
- 	if (entry->value->type != GCONF_VALUE_BOOL)
- 		return;
- 
-+	GDK_THREADS_ENTER();
-+
- 	menu = GTK_WIDGET (user_data);
- 	
- 	if (gconf_value_get_bool (entry->value)) {
-@@ -1329,6 +1335,7 @@
- 
- 		if (tearoff) {
- 			/* Do nothing */
-+			GDK_THREADS_LEAVE();
- 			return;
- 		}
- 		
-@@ -1345,6 +1352,7 @@
- 
- 		if (!tearoff) {
- 			/* Do nothing */
-+			GDK_THREADS_LEAVE();
- 			return;
- 		}
- 		
-@@ -1352,6 +1360,8 @@
- 		gtk_widget_destroy (tearoff);
- 		g_object_set_data (G_OBJECT (menu), "gnome-app-tearoff", NULL);
- 	}
-+
-+	GDK_THREADS_LEAVE();
- }
- 
- 
-@@ -2467,7 +2477,9 @@
-                 }
-         }
- 
-+	GDK_THREADS_ENTER();
-         gtk_toolbar_set_style(toolbar, style);
-+	GDK_THREADS_LEAVE();
- }
- 
- static void
-@@ -2511,7 +2523,9 @@
- 			style = GTK_TOOLBAR_BOTH;
-         }
- 
-+	GDK_THREADS_ENTER();
-         gtk_toolbar_set_style(toolbar, style);
-+	GDK_THREADS_LEAVE();
- }
- 
- static void
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
deleted file mode 100644
index aae4e39f8..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeui/gnome-app.c.orig	Sun Mar 20 20:51:20 2005
-+++ libgnomeui/gnome-app.c	Sun Mar 20 20:52:01 2005
-@@ -269,7 +269,9 @@
- 		detachable = gconf_value_get_bool (entry->value);
- 		
- 		/* Update */
-+		GDK_THREADS_ENTER();
- 		bonobo_dock_item_set_locked (item, !detachable);
-+		GDK_THREADS_LEAVE();
- 	}
- }
- 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
deleted file mode 100644
index e83891c08..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- libgnomeui/gnome-entry.c.orig	Sun Mar 20 20:54:19 2005
-+++ libgnomeui/gnome-entry.c	Sun Mar 20 20:54:20 2005
-@@ -419,6 +419,8 @@
- {
- 	GnomeEntry *gentry;
- 
-+	GDK_THREADS_ENTER();
-+
- 	gentry = GNOME_ENTRY (user_data);
- 
- 	/* If we're getting a notification from saving our own
-@@ -427,10 +429,13 @@
- 	if (gentry->_priv->saving_history) {
- 		gentry->_priv->saving_history = FALSE;
- 
-+		GDK_THREADS_LEAVE();
- 		return;
- 	}
- 
- 	gnome_entry_load_history (gentry);
-+
-+	GDK_THREADS_LEAVE();
- }
- 
- /* FIXME: Make this static */
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
deleted file mode 100644
index 5713fbd49..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-gconf-ui.c.orig	Sun Mar 20 20:38:41 2005
-+++ libgnomeui/gnome-gconf-ui.c	Sun Mar 20 20:39:51 2005
-@@ -148,6 +148,8 @@
-         g_return_val_if_fail(eid.client != NULL, FALSE);
-         g_return_val_if_fail(pending_errors != NULL, FALSE);
- 
-+        GDK_THREADS_ENTER();
-+
-         if (current_dialog == NULL) {
-                 GtkWidget *dialog;
-                 gboolean have_overridden = FALSE;
-@@ -245,6 +247,8 @@
- 
-         gtk_window_present (GTK_WINDOW (current_dialog));
-         
-+        GDK_THREADS_LEAVE();
-+
-         return FALSE;
- }
- 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
deleted file mode 100644
index 160e5ad9b..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-ice.c.orig	Sun Mar 20 20:33:56 2005
-+++ libgnomeui/gnome-ice.c	Sun Mar 20 20:34:21 2005
-@@ -54,6 +54,8 @@
-   IceConn connection = (IceConn) data;
-   IceProcessMessagesStatus status;
- 
-+  GDK_THREADS_ENTER();
-+
-   status = IceProcessMessages (connection, NULL, NULL);
- 
-   if (status == IceProcessMessagesIOError)
-@@ -73,6 +75,8 @@
- 	  IceCloseConnection (connection);
- 	}
-     }
-+
-+  GDK_THREADS_LEAVE();
- 
-   return TRUE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
deleted file mode 100644
index d096e0818..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-icon-sel.c.orig	Sun Mar 20 20:40:05 2005
-+++ libgnomeui/gnome-icon-sel.c	Sun Mar 20 20:42:24 2005
-@@ -353,6 +353,8 @@
- 		return FALSE;
- 	}
- 
-+	GDK_THREADS_ENTER();
-+
- 	append_an_icon (gis, list->data);
- 
- 	g_free (list->data);
-@@ -367,6 +369,8 @@
- 				       (double)gis->_priv->load_i / gis->_priv->load_file_count);
- 
- 	gis->_priv->load_i ++;
-+
-+	GDK_THREADS_LEAVE();
- 
- 	return TRUE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
deleted file mode 100644
index 46fc0489b..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- libgnomeui/gnome-pixmap-entry.c.orig	Sun Mar 20 20:34:49 2005
-+++ libgnomeui/gnome-pixmap-entry.c	Sun Mar 20 20:38:30 2005
-@@ -237,6 +237,8 @@
- {
- 	GSList *li,*tmp;
- 
-+	GDK_THREADS_ENTER();
-+
- 	tmp = changed_pentries;
- 	changed_pentries = NULL;
- 	if(tmp) {
-@@ -244,9 +246,13 @@
- 			refresh_preview(li->data);
- 		}
- 		g_slist_free(tmp);
-+
-+		GDK_THREADS_LEAVE();
- 		return TRUE;
- 	}
- 	change_timeout = 0;
-+
-+	GDK_THREADS_LEAVE();
- 
- 	return FALSE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
deleted file mode 100644
index a38f70052..000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgnomeui/gnome-ui-init.c.orig	Sun Mar 20 20:56:32 2005
-+++ libgnomeui/gnome-ui-init.c	Sun Mar 20 20:56:36 2005
-@@ -492,8 +492,10 @@
-                                 gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds"));
- 
-         if (new_use_event_sounds && !use_event_sounds) {
-+                GDK_THREADS_ENTER();
-                 initialize_gtk_signal_relay ();
-                 initialize_gnome_signal_relay ();
-+                GDK_THREADS_LEAVE();
- 	}
- 
-         use_event_sounds = new_use_event_sounds;
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 1441c54ae..6f2c0784b 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -229,8 +229,11 @@ share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/xh/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
+@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
 @unexec rmdir %D/share/locale/tt/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/tt 2> /dev/null || true
 @unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true