Update to 2.4.7 which has the fix for the FileSelector bug as well as

a potential crash when trying to get a user's home directory.

6 files changed, 6 insertions, 146 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f36187a07060..e2f6979b7c8d 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.4.6
-PORTREVISION=	1
+PORTVERSION=	2.4.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.3/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 8d55fe9da64b..68ec7eabe657 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gtk+-2.4.6.tar.bz2) = d3da9aecbb760d276353b3392f338cee
-SIZE (gnome2/gtk+-2.4.6.tar.bz2) = 9525829
+MD5 (gnome2/gtk+-2.4.7.tar.bz2) = 2cd21398a463ef205e6e7b28e54b936d
+SIZE (gnome2/gtk+-2.4.7.tar.bz2) = 8920441
 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c
 SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603
diff --git a/x11-toolkits/gtk20/files/patch-al b/x11-toolkits/gtk20/files/patch-al
deleted file mode 100644
index 65c0564fc6e4..000000000000
--- a/x11-toolkits/gtk20/files/patch-al
+++ /dev/null
@@ -1,69 +0,0 @@
---- gtk/gtkfilechooserdefault.c.orig	2004-08-13 21:01:49.000000000 +0300
-+++ gtk/gtkfilechooserdefault.c	2004-08-14 20:11:58.000000000 +0300
-@@ -1832,7 +1832,6 @@
- 
- struct selection_check_closure {
-   GtkFileChooserDefault *impl;
--  gboolean empty;
-   gboolean all_files;
-   gboolean all_folders;
- };
-@@ -1850,7 +1849,6 @@
-   gboolean is_folder;
- 
-   closure = data;
--  closure->empty = FALSE;
- 
-   gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
- 
-@@ -1864,23 +1862,23 @@
- /* Checks whether the selected items in the file list are all files or all folders */
- static void
- selection_check (GtkFileChooserDefault *impl,
--		 gboolean              *empty,
-+		 int                   *num_selected,
- 		 gboolean              *all_files,
- 		 gboolean              *all_folders)
- {
-   struct selection_check_closure closure;
-   GtkTreeSelection *selection;
-+  int selected_rows;
- 
-   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
- 
-+  selected_rows = gtk_tree_selection_count_selected_rows (selection);
-+
-   if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-       || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-     {
--      if (gtk_tree_selection_count_selected_rows (selection) == 0)
--	closure.empty = TRUE;
--      else
-+      if (selected_rows > 0)
- 	{
--	  closure.empty = FALSE;
- 	  closure.all_files = FALSE;
- 	  closure.all_folders = TRUE;
- 	}
-@@ -1891,7 +1889,6 @@
- 		|| impl->action == GTK_FILE_CHOOSER_ACTION_SAVE);
- 
-       closure.impl = impl;
--      closure.empty = TRUE;
-       closure.all_files = TRUE;
-       closure.all_folders = TRUE;
- 
-@@ -1900,10 +1897,10 @@
- 					   &closure);
-     }
- 
--  g_assert (closure.empty || !(closure.all_files && closure.all_folders));
-+  g_assert (selected_rows == 0 || !(closure.all_files && closure.all_folders));
- 
--  if (empty)
--    *empty = closure.empty;
-+  if (num_selected)
-+    *num_selected = selected_rows;
- 
-   if (all_files)
-     *all_files = closure.all_files;
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f36187a07060..e2f6979b7c8d 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.4.6
-PORTREVISION=	1
+PORTVERSION=	2.4.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.3/ \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 8d55fe9da64b..68ec7eabe657 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gtk+-2.4.6.tar.bz2) = d3da9aecbb760d276353b3392f338cee
-SIZE (gnome2/gtk+-2.4.6.tar.bz2) = 9525829
+MD5 (gnome2/gtk+-2.4.7.tar.bz2) = 2cd21398a463ef205e6e7b28e54b936d
+SIZE (gnome2/gtk+-2.4.7.tar.bz2) = 8920441
 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c
 SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603
diff --git a/x11-toolkits/gtk30/files/patch-al b/x11-toolkits/gtk30/files/patch-al
deleted file mode 100644
index 65c0564fc6e4..000000000000
--- a/x11-toolkits/gtk30/files/patch-al
+++ /dev/null
@@ -1,69 +0,0 @@
---- gtk/gtkfilechooserdefault.c.orig	2004-08-13 21:01:49.000000000 +0300
-+++ gtk/gtkfilechooserdefault.c	2004-08-14 20:11:58.000000000 +0300
-@@ -1832,7 +1832,6 @@
- 
- struct selection_check_closure {
-   GtkFileChooserDefault *impl;
--  gboolean empty;
-   gboolean all_files;
-   gboolean all_folders;
- };
-@@ -1850,7 +1849,6 @@
-   gboolean is_folder;
- 
-   closure = data;
--  closure->empty = FALSE;
- 
-   gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
- 
-@@ -1864,23 +1862,23 @@
- /* Checks whether the selected items in the file list are all files or all folders */
- static void
- selection_check (GtkFileChooserDefault *impl,
--		 gboolean              *empty,
-+		 int                   *num_selected,
- 		 gboolean              *all_files,
- 		 gboolean              *all_folders)
- {
-   struct selection_check_closure closure;
-   GtkTreeSelection *selection;
-+  int selected_rows;
- 
-   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
- 
-+  selected_rows = gtk_tree_selection_count_selected_rows (selection);
-+
-   if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-       || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-     {
--      if (gtk_tree_selection_count_selected_rows (selection) == 0)
--	closure.empty = TRUE;
--      else
-+      if (selected_rows > 0)
- 	{
--	  closure.empty = FALSE;
- 	  closure.all_files = FALSE;
- 	  closure.all_folders = TRUE;
- 	}
-@@ -1891,7 +1889,6 @@
- 		|| impl->action == GTK_FILE_CHOOSER_ACTION_SAVE);
- 
-       closure.impl = impl;
--      closure.empty = TRUE;
-       closure.all_files = TRUE;
-       closure.all_folders = TRUE;
- 
-@@ -1900,10 +1897,10 @@
- 					   &closure);
-     }
- 
--  g_assert (closure.empty || !(closure.all_files && closure.all_folders));
-+  g_assert (selected_rows == 0 || !(closure.all_files && closure.all_folders));
- 
--  if (empty)
--    *empty = closure.empty;
-+  if (num_selected)
-+    *num_selected = selected_rows;
- 
-   if (all_files)
-     *all_files = closure.all_files;