Add introspection support (needed for on-going GNOME 3 work).

ok landry@ (MAINTAINER)

www/webkit/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2011/03/08 18:56:30 landry Exp $
+# $OpenBSD: Makefile,v 1.44 2011/04/07 19:40:10 jasper Exp $
 
 COMMENT =	open source web browser engine
 
 DISTNAME =	webkit-1.2.7
 EPOCH =		0
-REVISION =	0
+REVISION =	1
 CATEGORIES =	www
 
 HOMEPAGE =	http://webkitgtk.org/
@@ -23,7 +23,9 @@ PERMIT_DISTFILES_FTP =	Yes
 VMEM_WARNING =	Yes
 
 USE_GMAKE =	Yes
-USE_LIBTOOL =	Yes
+# XXX: the libtool wrapper script is passed as argument to g-ir-scanner,
+# instead of the actual library
+USE_LIBTOOL =	gnu
 
 MODULES =	devel/gettext \
 		textproc/intltool
@@ -43,7 +45,7 @@ CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" \
 		ac_cv_path_FLEX=${LOCALBASE}/bin/gflex
-CONFIGURE_ARGS+=--enable-introspection=no
+CONFIGURE_ARGS+=--enable-introspection
 
 MAKE_FILE =	GNUmakefile
 MAKE_FLAGS =	STDCPPLIB=${STDCPPLIB}
@@ -73,7 +75,8 @@ LIB_DEPENDS =	x11/gtk+2,-main \
 
 BUILD_DEPENDS =	devel/bison \
 		devel/flex \
-		devel/gperf
+		devel/gperf \
+		devel/gobject-introspection
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/WebCore/plugins/PluginDatabase.cpp

www/webkit/patches/patch-WebKit_gtk_JSCore-1_0_gir

@@ -0,0 +1,26 @@
+$OpenBSD: patch-WebKit_gtk_JSCore-1_0_gir,v 1.1 2011/04/07 19:40:10 jasper Exp $
+
+Use the new syntaxis for GIR.
+
+--- WebKit/gtk/JSCore-1.0.gir.orig	Thu Apr  7 18:30:14 2011
++++ WebKit/gtk/JSCore-1.0.gir	Thu Apr  7 18:30:18 2011
+@@ -1,12 +1,14 @@
+ <?xml version="1.0"?>
+-<repository version="1.0"
++<repository version="1.2"
+             xmlns="http://www.gtk.org/introspection/core/1.0"
+             xmlns:c="http://www.gtk.org/introspection/c/1.0">
+   <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
+-    <alias name="GlobalContextRef"
+-           target="none"
+-           c:type="JSGlobalContextRef"/>
+-    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
++    <alias name="GlobalContextRef" target="none">
++      <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
++    </alias>
++    <alias name="ObjectRef" target="none">
++      <type name="JSObjectRef" c:type="JSObjectRef"/>
++    </alias>
+     <function name="EvaluateScript" c:identifier="JSEvaluateScript">
+       <return-value transfer-ownership="none">
+         <type name="none" c:type="void"/>

www/webkit/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2010/07/03 07:53:04 landry Exp $
+@comment $OpenBSD: PLIST,v 1.14 2011/04/07 19:40:10 jasper Exp $
 %%SHARED%%
 @bin bin/GtkLauncher
 @bin bin/jsc
@@ -39,9 +39,13 @@ include/webkit-1.0/webkit/webkitwebresource.h
 include/webkit-1.0/webkit/webkitwebsettings.h
 include/webkit-1.0/webkit/webkitwebview.h
 include/webkit-1.0/webkit/webkitwebwindowfeatures.h
+lib/girepository-1.0/JSCore-1.0.typelib
+lib/girepository-1.0/WebKit-1.0.typelib
 lib/libwebkit-1.0.a
 lib/libwebkit-1.0.la
 lib/pkgconfig/webkit-1.0.pc
+share/gir-1.0/JSCore-1.0.gir
+share/gir-1.0/WebKit-1.0.gir
 share/locale/cs/LC_MESSAGES/webkit.mo
 share/locale/de/LC_MESSAGES/webkit.mo
 share/locale/en_GB/LC_MESSAGES/webkit.mo