webkit-gtk3: update to 1.10.0.

srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.0-typedef-WebKitWebView.patch

@@ -1,28 +0,0 @@
-Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h
-===================================================================
---- Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h	(revision 109222)
-+++ Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h	(revision 109329)
-@@ -34,4 +34,6 @@
- 
- typedef struct _WebKitPrintOperation WebKitPrintOperation;
-+typedef struct _WebKitFindController WebKitFindController;
-+typedef struct _WebKitWebView        WebKitWebView;
- 
- #ifdef G_OS_WIN32
-@@ -47,6 +49,3 @@
- #endif
- 
--typedef struct _WebKitFindController WebKitFindController;
--typedef struct _WebKitWebView        WebKitWebView;
--
- #endif // WebKitDefines_h
-Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
-===================================================================
---- Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h	(revision 109222)
-+++ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h	(revision 109329)
-@@ -49,5 +49,4 @@
- #define WEBKIT_WEB_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
- 
--typedef struct _WebKitWebView WebKitWebView;
- typedef struct _WebKitWebViewClass WebKitWebViewClass;
- typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;

srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch

@@ -1,20 +0,0 @@
-From: Mikhail Khokhlov <mikhail.khokhlov@lge.com>
-
-https://bugs.webkit.org/show_bug.cgi?id=84526
-
-Index: Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
-===================================================================
---- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	(revision 115562)
-+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	(working copy)
-@@ -1444,9 +1444,10 @@
-     print IMPL "namespace WebKit {\n\n";
-     print IMPL @cBodyPriv;
-     print IMPL "} // namespace WebKit\n\n";
-+
-+    print IMPL @cBodyProperties;
-     print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString;
- 
--    print IMPL @cBodyProperties;
-     print IMPL @cBody;
- 
-     close(IMPL);

srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-gst-required-version.patch

@@ -1,29 +0,0 @@
-2012-05-01  Landry Breuil  <landry@openbsd.org>
-
-        [GTK] Fix gstreamer detection during configure
-        https://bugs.webkit.org/show_bug.cgi?id=84325
-
-        Reviewed by Philippe Normand.
-
-        * configure.ac: Fix GSTREAMER_REQUIRED_VERSION and
-        GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION assignments.
-
-Index: /trunk/configure.ac
-===================================================================
---- configure.ac	(revision 115666)
-+++ configure.ac	(revision 115737)
-@@ -343,10 +343,10 @@
- 
- case "$with_gstreamer" in
--     0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
--           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-+     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.10
-            ;;
--     0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
--           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-+     0.11) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_11_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.11
-            ;;

srcpkgs/webkit-gtk3/template

@@ -1,19 +1,19 @@
 # Template file for 'webkit-gtk3'
 pkgname=webkit-gtk3
-version=1.8.3
+version=1.10.0
 revision=1
-wrksrc=webkit-${version}
+wrksrc="webkitgtk-${version}"
 makedepends="perl pkg-config intltool which gperf bison25 flex
-jpeg-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel
+jpeg-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel>=3.6.0_2
 gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel>=49
-enchant-devel geoclue-devel gobject-introspection"
+enchant-devel geoclue-devel gobject-introspection ruby"
 subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel"
 short_desc="GTK+3 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://webkitgtk.org/"
 license="LGPL-2.1, Simplified BSD (2 clause)"
-distfiles="${homepage}/releases/webkit-${version}.tar.xz"
+distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7
+checksum=6db37376d387dcc980e5349a5a385d87d40909371796e3dd895817e466799034
 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
@@ -25,9 +25,9 @@ long_desc="
 
 do_configure() {
 	local args="--enable-jit --with-font-backend=freetype \
-		--enable-introspection \
+		--enable-introspection --disable-webkit2 \
 		--with-unicode-backend=icu --disable-schemas-compile \
-		${CONFIGURE_SHARED_ARGS}"
+		${CONFIGURE_SHARED_ARGS} --disable-silent-rules"
 
 	for ver in 2 3; do
 		[ ! -d ${wrksrc}/build-gtk${ver} ] && \
@@ -41,7 +41,7 @@ do_build() {
 	for ver in 2 3; do
 		msg_normal "Building GTK+${ver} version...\n"
 		cd ${wrksrc}/build-gtk${ver}
-		make ${makejobs}
+		make ${makejobs} || return 1
 	done
 }
 
@@ -49,6 +49,6 @@ do_install() {
 	for ver in 2 3; do
 		msg_normal "Installing GTK+${ver} version...\n"
 		cd ${wrksrc}/build-gtk${ver}
-		make DESTDIR=${DESTDIR} install
+		make DESTDIR=${DESTDIR} install || return 1
 	done
 }

srcpkgs/webkit-gtk3/webkit-gtk-devel.template

@@ -1,7 +1,7 @@
 # Template file for 'webkit-gtk-devel'.
 #
 noarch=yes
-depends="webkit-gtk>=$version"
+depends="glib-devel gtk+-devel libsoup-devel webkit-gtk>=$version"
 short_desc="GTK+ port of the WebKit browser engine - development files"
 long_desc="${long_desc}
  WebKit is an open source web browser engine. WebKit is also the name of

srcpkgs/webkit-gtk3/webkit-gtk.rshlibs

@@ -1,3 +1,4 @@
+libXcomposite.so.1
 libpthread.so.0
 libenchant.so.1
 libgailutil.so.18

srcpkgs/webkit-gtk3/webkit-gtk.template

@@ -18,7 +18,7 @@ do_install() {
 	vmove "usr/lib/libjavascriptcoregtk-1.0.so*" usr/lib
 	vmove "usr/lib/girepository-1.0/*-1.0.typelib" usr/lib/girepository-1.0
 	for f in $(echo ${SRCPKGDESTDIR}/usr/share/locale/*); do
-		vmove usr/share/locale/$(basename $f)/LC_MESSAGES/webkit-2.0.mo \
+		vmove usr/share/locale/$(basename $f)/LC_MESSAGES/webkitgtk-2.0.mo \
 			usr/share/locale/$(basename $f)/LC_MESSAGES
 	done
 	vmove usr/share/webkitgtk-1.0 usr/share

srcpkgs/webkit-gtk3/webkit-gtk3-devel.template

@@ -1,7 +1,7 @@
 # Template file for 'webkit-gtk-devel'.
 #
 noarch=yes
-depends="webkit-gtk3>=$version"
+depends="glib-devel gtk+3-devel>=3.6.0_2 libsoup-devel webkit-gtk3>=$version"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 

srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs

@@ -1,3 +1,4 @@
+libXcomposite.so.1
 libicui18n.so.49
 libicuuc.so.49
 libicudata.so.49