From e27abe89bff78506a0a5e368f488bd0be06fbd58 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sat, 5 May 2012 15:00:49 +0000
Subject: [PATCH] Fix build with latest glib2

---
 devel/guile-gnome/distinfo                        |  4 +++-
 ...-corba_gnome_corba_guile-gnome-corba-generic_c | 15 +++++++++++++++
 .../patch-glib_gnome_gobject_guile-support_h      | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c
 create mode 100644 devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h

diff --git a/devel/guile-gnome/distinfo b/devel/guile-gnome/distinfo
index 33650abe11ce..83d8dc66c8d0 100644
--- a/devel/guile-gnome/distinfo
+++ b/devel/guile-gnome/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2012/05/04 13:15:17 hans Exp $
+$NetBSD: distinfo,v 1.7 2012/05/05 15:00:49 dholland Exp $
 
 SHA1 (guile-gnome-platform-2.16.1.tar.gz) = 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061
 RMD160 (guile-gnome-platform-2.16.1.tar.gz) = 4723f091e015c4fca6986c48fa143e7fd3070631
@@ -7,4 +7,6 @@ SHA1 (patch-aa) = 6343a2d81e9f2747250f231beee376c21ba3bfb5
 SHA1 (patch-ab) = bcfc2cf7eccbef8c17db683a7fbbdef7b05c9d42
 SHA1 (patch-ac) = 7409fd75f94ec0a59b94939853b41b85e1a69768
 SHA1 (patch-corba_gnome_corba_Makefile.in) = 52e00564e2d246e78e82787809706aa7c7e44523
+SHA1 (patch-corba_gnome_corba_guile-gnome-corba-generic_c) = bb45658f0edb43c0b34c43fb66ebb881904db4cb
 SHA1 (patch-glib_gnome_gobject_Makefile.in) = 83a5533d70e36bb55476661af066e0ceaf13c1f0
+SHA1 (patch-glib_gnome_gobject_guile-support_h) = be6e66f594e1f0518853a9cf688259507025bf46
diff --git a/devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c b/devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c
new file mode 100644
index 000000000000..fd2012992e07
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-corba_gnome_corba_guile-gnome-corba-generic_c,v 1.1 2012/05/05 15:00:49 dholland Exp $
+
+Fix build with latest glib2.
+
+--- corba/gnome/corba/guile-gnome-corba-generic.c~	2007-05-20 16:39:16.000000000 +0000
++++ corba/gnome/corba/guile-gnome-corba-generic.c
+@@ -24,7 +24,7 @@
+ 
+ #include <guile-gnome-corba-generic.h>
+ #include <guile-gnome-gobject.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <string.h>
+ 
+ static GQuark quark_corba_typecode = 0;
diff --git a/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h b/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h
new file mode 100644
index 000000000000..38cb07ab6454
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-glib_gnome_gobject_guile-support_h,v 1.1 2012/05/05 15:00:49 dholland Exp $
+
+Fix build with latest glib2.
+
+--- glib/gnome/gobject/guile-support.h~	2008-04-24 10:10:14.000000000 +0000
++++ glib/gnome/gobject/guile-support.h
+@@ -24,7 +24,7 @@
+ #ifndef __GUILE_SUPPORT_H__
+ #define __GUILE_SUPPORT_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ #include <libguile.h>
+