Fix compilation when building against gtk+ >= 2.18. Patches from the upstream

sources.  This should address PR pkg/42508.
While here add the LICENSE setting.

5 files changed, 64 insertions, 2 deletions

diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index 5f0409cba50..2948b359e63 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/04/22 13:43:19 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/05/13 02:50:06 dmcmahill Exp $
 
 DISTNAME=	guile-gnome-platform-2.16.1
 PKGREVISION=	10
@@ -8,6 +8,7 @@ MASTER_SITES=	http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/guile-gnome/
 COMMENT=	Library to access gobject/glib/gtk and gnome from guile
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	guile-slib>=2.4.2:../../devel/guile-slib
 
@@ -18,6 +19,12 @@ USE_TOOLS+=		gmake makeinfo pkg-config
 USE_LIBTOOL=		YES
 INFO_FILES=		YES
 
+# warnings on alpha (perhaps other 64-bit too?)
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
+post-install:
+	rm -f ${DESTDIR}${PREFIX}/share/guile-gnome-2/gnome/overrides/gtk.defs.orig
+
 # XXX This should arguably be split into separate packages.
 
 .include "../../devel/atk/buildlink3.mk"
diff --git a/devel/guile-gnome/distinfo b/devel/guile-gnome/distinfo
index f32489557fd..788094e9909 100644
--- a/devel/guile-gnome/distinfo
+++ b/devel/guile-gnome/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/02/21 02:35:52 gdt Exp $
+$NetBSD: distinfo,v 1.5 2011/05/13 02:50:06 dmcmahill Exp $
 
 SHA1 (guile-gnome-platform-2.16.1.tar.gz) = 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061
 RMD160 (guile-gnome-platform-2.16.1.tar.gz) = 4723f091e015c4fca6986c48fa143e7fd3070631
 Size (guile-gnome-platform-2.16.1.tar.gz) = 3494333 bytes
+SHA1 (patch-aa) = 6343a2d81e9f2747250f231beee376c21ba3bfb5
+SHA1 (patch-ab) = bcfc2cf7eccbef8c17db683a7fbbdef7b05c9d42
+SHA1 (patch-ac) = 7409fd75f94ec0a59b94939853b41b85e1a69768
diff --git a/devel/guile-gnome/patches/patch-aa b/devel/guile-gnome/patches/patch-aa
new file mode 100644
index 00000000000..0942cfe453c
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.5 2011/05/13 02:50:06 dmcmahill Exp $
+
+Upstream patch from http://bugzilla-attachments.gnome.org/attachment.cgi?id=148640
+
+--- gtk/gnome/gw/gtk-support.c.orig	2008-07-03 14:52:27.000000000 +0000
++++ gtk/gnome/gw/gtk-support.c
+@@ -1012,10 +1012,14 @@ gtk_widget_get_window (GtkWidget *widget
+ }
+ 
+ GdkRectangle*
+-gtk_widget_get_allocation (GtkWidget *widget)
++_wrap_gtk_widget_get_allocation (GtkWidget *widget)
+ {
+     GdkRectangle *ret = g_new (GdkRectangle, 1);
++#if GTK_CHECK_VERSION(2,18,0)
++    gtk_widget_get_allocation (widget, (GtkAllocation*)ret);
++#else
+     *ret = widget->allocation;
++#endif
+     return ret;
+ }
+ 
diff --git a/devel/guile-gnome/patches/patch-ab b/devel/guile-gnome/patches/patch-ab
new file mode 100644
index 00000000000..2296040cf94
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.3 2011/05/13 02:50:06 dmcmahill Exp $
+
+Upstream patch from http://bugzilla-attachments.gnome.org/attachment.cgi?id=148640
+
+--- gtk/gnome/gw/gtk-support.h.orig	2008-04-09 22:10:40.000000000 +0000
++++ gtk/gnome/gw/gtk-support.h
+@@ -117,6 +117,6 @@ void _wrap_gtk_tree_view_column_set_cell
+ guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar *string, GError **error);
+ 
+ GdkWindow* gtk_widget_get_window (GtkWidget *widget);
+-GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget);
++GdkRectangle* _wrap_gtk_widget_get_allocation (GtkWidget *widget);
+ void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const GList *types, GdkDragAction actions);
+ GtkStateType gtk_widget_get_state (GtkWidget *widget);
diff --git a/devel/guile-gnome/patches/patch-ac b/devel/guile-gnome/patches/patch-ac
new file mode 100644
index 00000000000..3bd5fac4ee6
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.3 2011/05/13 02:50:06 dmcmahill Exp $
+
+Upstream patch from http://bugzilla-attachments.gnome.org/attachment.cgi?id=148640
+
+--- gtk/gnome/overrides/gtk.defs.orig	2008-04-09 22:12:44.000000000 +0000
++++ gtk/gnome/overrides/gtk.defs
+@@ -848,7 +848,8 @@
+ 
+ (define-method get-allocation
+   (of-object "GtkWidget")
+-  (c-name "gtk_widget_get_allocation")
++  (c-name "_wrap_gtk_widget_get_allocation")
++  (overrides "gtk_widget_get_allocation")
+   (return-type "GdkRectangle*")) ;; same as GtkAllocation
+ 
+ (define-method get_state