From 792f7b96b7b391ba7f074de9cb08c4410d1462db Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 24 Oct 2010 20:51:39 +0200
Subject: [PATCH] webkit-gtk: update to 1.2.5.

---
 srcpkgs/gir-webkit-gtk                        |  1 +
 srcpkgs/webkit-gtk/gir-webkit-gtk.template    | 13 +++++++++++
 .../webkit-gtk/patches/introspection.patch    | 22 +++++++++++++++++++
 srcpkgs/webkit-gtk/template                   | 16 +++++++++-----
 srcpkgs/webkit-gtk/webkit-gtk-devel.template  |  4 +++-
 5 files changed, 49 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/gir-webkit-gtk
 create mode 100644 srcpkgs/webkit-gtk/gir-webkit-gtk.template
 create mode 100644 srcpkgs/webkit-gtk/patches/introspection.patch

diff --git a/srcpkgs/gir-webkit-gtk b/srcpkgs/gir-webkit-gtk
new file mode 120000
index 0000000000..dd01fa7988
--- /dev/null
+++ b/srcpkgs/gir-webkit-gtk
@@ -0,0 +1 @@
+webkit-gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit-gtk/gir-webkit-gtk.template b/srcpkgs/webkit-gtk/gir-webkit-gtk.template
new file mode 100644
index 0000000000..dcbce375e3
--- /dev/null
+++ b/srcpkgs/webkit-gtk/gir-webkit-gtk.template
@@ -0,0 +1,13 @@
+# Template file for 'gir-webkit-gtk'.
+#
+short_desc="Introspection data for WebKit GTK+"
+long_desc="${long_desc}
+
+ This package contains small pieces of introspection data for the
+ WebKit GTK+ library."
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/webkit-gtk/patches/introspection.patch b/srcpkgs/webkit-gtk/patches/introspection.patch
new file mode 100644
index 0000000000..ad65cd4aa6
--- /dev/null
+++ b/srcpkgs/webkit-gtk/patches/introspection.patch
@@ -0,0 +1,22 @@
+--- WebKit/gtk/JSCore-1.0.gir.o	2010-09-29 14:54:07.000000000 +0200
++++ WebKit/gtk/JSCore-1.0.gir	2010-09-29 15:57:06.000000000 +0200
+@@ -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"/>
diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template
index 569750a9dc..64a5137e56 100644
--- a/srcpkgs/webkit-gtk/template
+++ b/srcpkgs/webkit-gtk/template
@@ -1,15 +1,15 @@
 # Template file for 'webkit-gtk'
 pkgname=webkit-gtk
-version=1.2.1
+version=1.2.5
 wrksrc=webkit-${version}
 distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz"
 build_style=gnu_configure
 configure_args="--with-target=x11 --enable-3D-transforms
 --enable-channel-messaging --with-font-backend=freetype
---enable-jit"
+--enable-jit --enable-introspection"
 short_desc="GTK2 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c9ee551eab4e98730fa06aaa493ce95828e6c6661ec14361e6254bc23795a2dd
+checksum=b08a69a9ccbd84b2e23a94caf7eb5cfc390bb6cef49a4921b5eb11860b329d41
 long_desc="
  WebKit is an open source web browser engine. WebKit is also the name of
  the Mac OS X system framework version of the engine that's used by
@@ -19,10 +19,14 @@ long_desc="
 
  This is the GTK2+ port of the engine."
 
-subpackages="$pkgname-devel"
+disable_parallel_build=yes
+subpackages="gir-$pkgname $pkgname-devel"
 
+Add_dependency run libgcc
 Add_dependency run glibc
+Add_dependency run libstdc++
 Add_dependency run enchant
+Add_dependency run gdk-pixbuf
 Add_dependency run gtk+
 Add_dependency run gst-plugins-base
 Add_dependency run gstreamer
@@ -44,8 +48,7 @@ Add_dependency run libXt
 Add_dependency run libX11
 Add_dependency run libSM
 Add_dependency run libICE
-Add_dependency run libstdc++
-Add_dependency run libgcc
+
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gperf
@@ -73,3 +76,4 @@ Add_dependency build libX11-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
 Add_dependency build libstdc++-devel
+Add_dependency build gobject-introspection
diff --git a/srcpkgs/webkit-gtk/webkit-gtk-devel.template b/srcpkgs/webkit-gtk/webkit-gtk-devel.template
index fcd0a23f21..d1ad80dc8c 100644
--- a/srcpkgs/webkit-gtk/webkit-gtk-devel.template
+++ b/srcpkgs/webkit-gtk/webkit-gtk-devel.template
@@ -10,6 +10,7 @@ Add_dependency run intltool
 Add_dependency run gperf
 Add_dependency run flex
 Add_dependency run enchant-devel
+Add_dependency run gdk-pixbuf-devel
 Add_dependency run gtk+-devel
 Add_dependency run gst-plugins-base-devel
 Add_dependency run gstreamer-devel
@@ -36,7 +37,8 @@ Add_dependency run webkit-gtk
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
+	install -d ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
 }