Patch GTK vapi bug (needed by valide)

Add vapigen option an enable it (closes pkg/41001)
Fix a minor PLIST problem

7 files changed, 62 insertions, 7 deletions

diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 39e271b2e96..079ccf68a7b 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/05 21:56:29 ahoka Exp $
+# $NetBSD: Makefile,v 1.2 2009/03/21 18:03:42 ahoka Exp $
 #
 
 DISTNAME=	vala-0.5.7
+PKGREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	http://download.gnome.org/sources/vala/0.5/
 EXTRACT_SUFX=	.tar.bz2
@@ -22,6 +23,8 @@ BUILDLINK_API_DEPENDS.glib2+=                   glib2>=2.12.0
 BUILDLINK_API_DEPENDS.gtk2+=                    gtk2+>=2.10.0
 BUILDLINK_DEPMETHOD.libxslt?=			build
 
+.include "options.mk"
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/lang/vala/PLIST b/lang/vala/PLIST
index 02b8eb89ad2..f9744ccaac4 100644
--- a/lang/vala/PLIST
+++ b/lang/vala/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/05 21:56:29 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/03/21 18:03:42 ahoka Exp $
 bin/valac
 include/vala-1.0/ccode/valaccodeassignment.h
 include/vala-1.0/ccode/valaccodebinaryexpression.h
@@ -378,8 +378,6 @@ share/vala/vapi/zlib.vapi
 @dirrm share/vala/vapi
 @dirrm share/vala
 @dirrm share/devhelp/books/vala
-@dirrm share/devhelp/books
-@dirrm share/devhelp
 @dirrm include/vala-1.0/vala
 @dirrm include/vala-1.0/gobject
 @dirrm include/vala-1.0/gee
diff --git a/lang/vala/PLIST.vapigen b/lang/vala/PLIST.vapigen
new file mode 100644
index 00000000000..d3bb3f741eb
--- /dev/null
+++ b/lang/vala/PLIST.vapigen
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.vapigen,v 1.1 2009/03/21 18:03:42 ahoka Exp $
+bin/vala-gen-introspect
+bin/vapicheck
+bin/vapigen
+lib/vala/gen-introspect
+man/man1/vala-gen-introspect.1
+man/man1/vapigen.1
+@dirrm lib/vala
diff --git a/lang/vala/buildlink3.mk b/lang/vala/buildlink3.mk
index 9c1a25b23ec..b95519283c5 100644
--- a/lang/vala/buildlink3.mk
+++ b/lang/vala/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/21 18:03:42 ahoka Exp $
 
 BUILDLINK_TREE+=	vala
 
 .if !defined(VALA_BUILDLINK3_MK)
 VALA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.vala+=	vala>=0.5.7
+BUILDLINK_API_DEPENDS.vala+=	vala>=0.5.7nb1
 BUILDLINK_PKGSRCDIR.vala?=	../../lang/vala
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index b1e4c74c9e0..2cbd1fa8385 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/05 21:56:29 ahoka Exp $
+$NetBSD: distinfo,v 1.2 2009/03/21 18:03:42 ahoka Exp $
 
 SHA1 (vala-0.5.7.tar.bz2) = 1dc811adbe0c186a49339a205abaaa3440084749
 RMD160 (vala-0.5.7.tar.bz2) = 77796a069e0663853562c096c132d59502400bf4
 Size (vala-0.5.7.tar.bz2) = 1562355 bytes
+SHA1 (patch-gtk+-2.0.vapi) = a5817bbb4be6192bfe27dadc5e82a4a5eeb5c01a
diff --git a/lang/vala/options.mk b/lang/vala/options.mk
new file mode 100644
index 00000000000..47aafc05f61
--- /dev/null
+++ b/lang/vala/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2009/03/21 18:03:42 ahoka Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.vala
+PKG_SUPPORTED_OPTIONS+=	vapigen
+PKG_SUGGESTED_OPTIONS+=	vapigen
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mvapigen)
+CONFIGURE_ARGS+=	--enable-vapigen
+PLIST_SRC+=		PLIST PLIST.vapigen
+.endif
diff --git a/lang/vala/patches/patch-gtk+-2.0.vapi b/lang/vala/patches/patch-gtk+-2.0.vapi
new file mode 100644
index 00000000000..e01d3b4a0b3
--- /dev/null
+++ b/lang/vala/patches/patch-gtk+-2.0.vapi
@@ -0,0 +1,33 @@
+Index: vapi/gtk+-2.0.vapi
+===================================================================
+--- vapi/gtk+-2.0.vapi	(révision 2334)
++++ vapi/gtk+-2.0.vapi	(copie de travail)
+@@ -4524,6 +4524,8 @@
+ 		[CCode (type = "GtkWidget*", has_construct_function = false)]
+ 		public TreeView ();
+ 		public int remove_column (Gtk.TreeViewColumn column);
++		[CCode (cname = "gtk_tree_view_row_expanded")]
++		public bool row_is_expanded (Gtk.TreePath path);
+ 		public void scroll_to_cell (Gtk.TreePath? path, Gtk.TreeViewColumn? column, bool use_align, float row_align, float col_align);
+ 		public void scroll_to_point (int tree_x, int tree_y);
+ 		public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, Gtk.DestroyNotify destroy);
+@@ -5539,13 +5541,13 @@
+ 	}
+ 	[CCode (type_id = "GTK_TYPE_RECENT_DATA", cheader_filename = "gtk/gtk.h")]
+ 	public struct RecentData {
+-		public string display_name;
+-		public string description;
+-		public string mime_type;
+-		public string app_name;
+-		public string app_exec;
++		public weak string display_name;
++		public weak string description;
++		public weak string mime_type;
++		public weak string app_name;
++		public weak string app_exec;
+ 		[CCode (array_length = false)]
+-		public string[] groups;
++		public weak string[] groups;
+ 		public bool is_private;
+ 	}
+ 	[CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")]