Fix build problem with glib-2.14.0.

5 files changed, 50 insertions, 1 deletions

diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile
index 8570e259459..28e3f230a9b 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-gnome2-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/29 06:42:34 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2007/08/19 03:00:26 taca Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
@@ -10,6 +10,7 @@ CONFLICTS+=		ruby-gnome2-glib-[0-9]*
 RUBY_EXTCONF_SUBDIRS=	glib
 
 USE_TOOLS+=		pkg-config
+DISTINFO_FILE?=		${.CURDIR}/distinfo
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-glib/distinfo b/devel/ruby-gnome2-glib/distinfo
new file mode 100644
index 00000000000..be8f3aa0c00
--- /dev/null
+++ b/devel/ruby-gnome2-glib/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2007/08/19 03:00:26 taca Exp $
+
+SHA1 (ruby-gnome2-all-0.16.0.tar.gz) = 488f6c1f139060e005f336c9c854c4dc5b3e6b7c
+RMD160 (ruby-gnome2-all-0.16.0.tar.gz) = c83c7cdcf633ad5cc213180f641a6c8f18002a9c
+Size (ruby-gnome2-all-0.16.0.tar.gz) = 1208856 bytes
+SHA1 (patch-aa) = c2d366bd156936838ec0a8f74ab89474f3373931
+SHA1 (patch-ab) = 513dea951b8596dafd4c0c4f58cb7614b6a68dc0
+SHA1 (patch-ac) = 28e54cb6be9dbad161379989bc815a2bc84360bb
diff --git a/devel/ruby-gnome2-glib/patches/patch-aa b/devel/ruby-gnome2-glib/patches/patch-aa
new file mode 100644
index 00000000000..f5ede479fc4
--- /dev/null
+++ b/devel/ruby-gnome2-glib/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2007/08/19 03:00:27 taca Exp $
+
+--- glib/src/rbgobj_boxed.c.orig	2006-12-29 22:17:28.000000000 +0900
++++ glib/src/rbgobj_boxed.c
+@@ -145,7 +145,8 @@ rbgobj_boxed_initialize(obj, boxed)
+ 
+ gpointer
+ rbgobj_boxed_get(obj, gtype)
+-    VALUE obj, gtype;
++    VALUE obj;
++    GType gtype;
+ {
+     boxed_holder* holder;
+     Data_Get_Struct(obj, boxed_holder, holder);
diff --git a/devel/ruby-gnome2-glib/patches/patch-ab b/devel/ruby-gnome2-glib/patches/patch-ab
new file mode 100644
index 00000000000..0aa71fb22fe
--- /dev/null
+++ b/devel/ruby-gnome2-glib/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/19 03:00:27 taca Exp $
+
+--- glib/src/rbglib_maincontext.c.orig	2006-12-29 13:17:28.000000000 +0000
++++ glib/src/rbglib_maincontext.c
+@@ -343,7 +343,7 @@ timeout_add_seconds(VALUE self, VALUE in
+     info->callback = func;
+     id = g_timeout_add_seconds(NUM2UINT(interval),
+                                (GSourceFunc)invoke_source_func,
+-                               (gpointer)info, g_free);
++                               (gpointer)info);
+     info->id = id;
+     rb_id = UINT2NUM(id);
+     G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
diff --git a/devel/ruby-gnome2-glib/patches/patch-ac b/devel/ruby-gnome2-glib/patches/patch-ac
new file mode 100644
index 00000000000..7c61440a025
--- /dev/null
+++ b/devel/ruby-gnome2-glib/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/08/19 03:00:28 taca Exp $
+
+--- glib/src/rbglib_unicode.c.orig	2006-12-29 13:17:28.000000000 +0000
++++ glib/src/rbglib_unicode.c
+@@ -140,7 +140,7 @@ static VALUE
+ rbglib_m_unichar_get_script(VALUE self, VALUE unichar)
+ {
+     return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)),
+-                      G_TYPE_UNICODE_SCRIPT_TYPE);
++                      G_TYPE_UNICODE_SCRIPT);
+ }
+ #endif
+