update to 2.20.1

this switches to the gnome-2.30 branch

3 files changed, 4 insertions, 55 deletions

diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index ca5dfe965fb..45efdb801a8 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2010/04/15 01:09:55 wiz Exp $
+$NetBSD: patch-ab,v 1.23 2010/05/31 17:34:33 drochner Exp $
 
-http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html
-
---- gtk/gtkentry.c.orig	2010-03-17 13:45:47.000000000 +0000
+--- gtk/gtkentry.c.orig	2010-05-02 03:14:28.000000000 +0000
 +++ gtk/gtkentry.c
-@@ -6661,8 +6661,11 @@ gtk_entry_set_buffer (GtkEntry       *en
+@@ -6712,8 +6712,11 @@ gtk_entry_set_buffer (GtkEntry       *en
    g_object_notify (obj, "invisible-char-set");
    g_object_thaw_notify (obj);
  
@@ -17,4 +15,4 @@ http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html
 +    }
  }
  
- 
+ /**
diff --git a/x11/gtk2/patches/patch-gb b/x11/gtk2/patches/patch-gb
deleted file mode 100644
index 9ff760db36c..00000000000
--- a/x11/gtk2/patches/patch-gb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gb,v 1.1 2008/12/15 11:17:47 rillig Exp $
-
-Prevent an int-to-pointer-cast warning from gcc.
-
---- modules/other/gail/gailbutton.c.orig	2008-10-17 06:06:24.000000000 +0200
-+++ modules/other/gail/gailbutton.c	2008-12-15 11:34:12.000000000 +0100
-@@ -475,7 +475,7 @@ gail_button_do_action (AtkAction *action
- 	{
- 	  button->action_queue = g_queue_new ();
- 	}
--      g_queue_push_head (button->action_queue, (gpointer) i);
-+      g_queue_push_head (button->action_queue, (gpointer) (gssize) i);
-       if (!button->action_idle_handler)
- 	button->action_idle_handler = gdk_threads_add_idle (idle_do_action, button);
-       break;
diff --git a/x11/gtk2/patches/patch-ob b/x11/gtk2/patches/patch-ob
deleted file mode 100644
index ad3c2836c7d..00000000000
--- a/x11/gtk2/patches/patch-ob
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ob,v 1.1 2008/12/15 11:17:47 rillig Exp $
-
-Prevent an int-to-pointer-cast warning from gcc. The specification says
-about gsize that "This type is wide enough to hold the numeric value of
-a pointer", so there's no additional loss in converting a glong first to
-gssize and later to (void *).
-
---- gtk/tests/object.c.orig	2008-10-17 06:06:13.000000000 +0200
-+++ gtk/tests/object.c	2008-12-15 11:27:59.000000000 +0100
-@@ -199,19 +199,19 @@ value_as_pointer (GValue *value)
-   if (g_value_fits_pointer (value))
-     return g_value_peek_pointer (value);
-   if (G_VALUE_HOLDS_BOOLEAN (value))
--    return (void*) g_value_get_boolean (value);
-+    return (void*) (gsize) g_value_get_boolean (value);
-   if (G_VALUE_HOLDS_CHAR (value))
-     return (void*) (gssize) g_value_get_char (value);
-   if (G_VALUE_HOLDS_UCHAR (value))
-     return (void*) (gsize) g_value_get_uchar (value);
-   if (G_VALUE_HOLDS_INT (value))
--    return (void*) g_value_get_int (value);
-+    return (void*) (gssize) g_value_get_int (value);
-   if (G_VALUE_HOLDS_UINT (value))
--    return (void*) g_value_get_uint (value);
-+    return (void*) (gsize) g_value_get_uint (value);
-   if (G_VALUE_HOLDS_LONG (value))
--    return (void*) g_value_get_long (value);
-+    return (void*) (gssize) g_value_get_long (value);
-   if (G_VALUE_HOLDS_ULONG (value))
--    return (void*) g_value_get_ulong (value);
-+    return (void*) (gsize) g_value_get_ulong (value);
-   if (G_VALUE_HOLDS_FLOAT (value))
-     return (void*) (gssize) g_value_get_float (value);
-   if (G_VALUE_HOLDS_DOUBLE (value))