From bbc4eb0ab90ba7446dadbc2bd80a1018a2ff5ecc Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Mon, 15 Dec 2008 11:17:47 +0000
Subject: Added two patches so that this package passes gcc with the option
 -Werror=int-to-pointer-cast.

---
 x11/gtk2/distinfo         |  4 +++-
 x11/gtk2/patches/patch-gb | 15 +++++++++++++++
 x11/gtk2/patches/patch-ob | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 x11/gtk2/patches/patch-gb
 create mode 100644 x11/gtk2/patches/patch-ob

(limited to 'x11/gtk2')

diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index f6b9c18f129..cb60df72467 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.105 2008/10/24 21:30:43 wiz Exp $
+$NetBSD: distinfo,v 1.106 2008/12/15 11:17:47 rillig Exp $
 
 SHA1 (gtk+-2.14.4.tar.bz2) = ed480432b57a41e04896642465e58ceeb179ca22
 RMD160 (gtk+-2.14.4.tar.bz2) = b0a625459b64e3a2ddbca60c22175eec18a8bc68
 Size (gtk+-2.14.4.tar.bz2) = 17258261 bytes
 SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
 SHA1 (patch-aj) = 4e36ab908ae14d81bd62c3eb170be87f14bb6a35
+SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
+SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb
diff --git a/x11/gtk2/patches/patch-gb b/x11/gtk2/patches/patch-gb
new file mode 100644
index 00000000000..9ff760db36c
--- /dev/null
+++ b/x11/gtk2/patches/patch-gb
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..ad3c2836c7d
--- /dev/null
+++ b/x11/gtk2/patches/patch-ob
@@ -0,0 +1,34 @@
+$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))
-- 
cgit v1.2.3