Update to 2.10.10.

4 files changed, 11 insertions, 71 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 85f8169a52ee..1b40feeb2487 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.10.9
-PORTREVISION?=	1
+PORTVERSION=	2.10.10
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index c7beb3cf485c..806d93b60f61 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.9.tar.bz2) = 20d763198efb38263b22dee347f69da6
-SHA256 (gnome2/gtk+-2.10.9.tar.bz2) = 3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3
-SIZE (gnome2/gtk+-2.10.9.tar.bz2) = 14933330
+MD5 (gnome2/gtk+-2.10.10.tar.bz2) = 73967e62a2e2e588ace772ac9db1bc32
+SHA256 (gnome2/gtk+-2.10.10.tar.bz2) = f6b3448fcb0eaad1be873eb33c4b733414288b9aada6b51c6ac44140001e89b1
+SIZE (gnome2/gtk+-2.10.10.tar.bz2) = 15125824
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkfilechooserbutton.c b/x11-toolkits/gtk30/files/patch-gtk_gtkfilechooserbutton.c
deleted file mode 100644
index 1fa8a1d47438..000000000000
--- a/x11-toolkits/gtk30/files/patch-gtk_gtkfilechooserbutton.c
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: gtk/gtkfilechooserbutton.c
-===================================================================
---- gtk/gtkfilechooserbutton.c	(revision 17341)
-+++ gtk/gtkfilechooserbutton.c	(working copy)
-@@ -1193,8 +1193,8 @@
- 			       gpointer             user_data)
- {
-   gboolean cancelled = handle->cancelled;
--  GdkPixbuf *pixbuf;
-   struct ChangeIconThemeData *data = user_data;
-+  GtkTreePath *path;
- 
-   if (!g_slist_find (data->button->priv->change_icon_theme_handles, handle))
-     goto out;
-@@ -1205,29 +1205,33 @@
-   if (cancelled || error)
-     goto out;
- 
--  pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
--				      data->button->priv->icon_size, NULL);
--
--  if (pixbuf)
-+  path = gtk_tree_row_reference_get_path (data->row_ref);
-+  if (path)
-     {
--      gint width = 0;
--      GtkTreeIter iter;
--      GtkTreePath *path;
-+      GdkPixbuf *pixbuf;
- 
--      width = MAX (width, gdk_pixbuf_get_width (pixbuf));
-+      pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
-+					  data->button->priv->icon_size, NULL);
-+      if (pixbuf)
-+	{
-+	  gint width = 0;
-+	  GtkTreeIter iter;
- 
--      path = gtk_tree_row_reference_get_path (data->row_ref);
--      gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
--      gtk_tree_path_free (path);
-+	  width = MAX (width, gdk_pixbuf_get_width (pixbuf));
- 
--      gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
--			  ICON_COLUMN, pixbuf,
--			  -1);
--      g_object_unref (pixbuf);
-+	  gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
- 
--      g_object_set (data->button->priv->icon_cell,
--		    "width", width,
--		    NULL);
-+	  gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
-+			      ICON_COLUMN, pixbuf,
-+			      -1);
-+	  g_object_unref (pixbuf);
-+
-+	  g_object_set (data->button->priv->icon_cell,
-+			"width", width,
-+			NULL);
-+	}
-+
-+      gtk_tree_path_free (path);
-     }
- 
- out:
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 4e55bb98a4b6..a7009f228e86 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -417,6 +417,8 @@ share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
 share/locale/az_IR/LC_MESSAGES/gtk20.mo
 share/locale/be/LC_MESSAGES/gtk20-properties.mo
 share/locale/be/LC_MESSAGES/gtk20.mo
+share/locale/be@latin/LC_MESSAGES/gtk20-properties.mo
+share/locale/be@latin/LC_MESSAGES/gtk20.mo
 share/locale/bg/LC_MESSAGES/gtk20-properties.mo
 share/locale/bg/LC_MESSAGES/gtk20.mo
 share/locale/bn/LC_MESSAGES/gtk20-properties.mo
@@ -445,6 +447,8 @@ share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
 share/locale/en_CA/LC_MESSAGES/gtk20.mo
 share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
 share/locale/en_GB/LC_MESSAGES/gtk20.mo
+share/locale/eo/LC_MESSAGES/gtk20-properties.mo
+share/locale/eo/LC_MESSAGES/gtk20.mo
 share/locale/es/LC_MESSAGES/gtk20-properties.mo
 share/locale/es/LC_MESSAGES/gtk20.mo
 share/locale/et/LC_MESSAGES/gtk20-properties.mo
@@ -690,6 +694,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
 @dirrmtry share/locale/az_IR/LC_MESSAGES