Update to 1.3.3.

Fix font for the page not found error message [1].

PR:		ports/148182 [1]
Submitted by:	Romain Tartiere <romain@FreeBSD.org>


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14347 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 93 insertions, 360 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 7eb9c5404..18bab2d12 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.63 2010/07/05 11:31:46 kwm Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.64 2010/07/13 09:56:34 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
@@ -52,8 +52,8 @@ OPTIONS=	VIDEO "Enable video support" on \
 
 .include <bsd.port.pre.mk>
 
-.if exists (${LOCALBASE}/lib/libicutu.so.43)
-LIB_DEPENDS+=	icutu.43:${PORTSDIR}/devel/icu4
+.if exists (${LOCALBASE}/lib/libicutu.so.44)
+LIB_DEPENDS+=	icutu.44:${PORTSDIR}/devel/icu4
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-WebCore_platform_text_TextBreakIterator.h
 .else
 LIB_DEPENDS+=	icutu.38:${PORTSDIR}/devel/icu
@@ -92,8 +92,6 @@ post-patch:
 		${WRKSRC}/WebCore/make-hash-tools.pl \
 		${WRKSRC}/WebCore/css/makevalues.pl \
 		${WRKSRC}/WebCore/css/makeprop.pl
-	@${REINPLACE_CMD} -e 's|GETTEXT_PACKAGE=$$PACKAGE|GETTEXT_PACKAGE=$$PACKAGE-1.0|g' \
-		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 .if !defined(WITH_STATIC)
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 6d4c1dca0..3f584cbe1 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.3.2.tar.gz) = 8736b933d059288cdff9f9be64358954
-SHA256 (webkit-1.3.2.tar.gz) = b0f265a1f339f19855572ac6e18a2c1f6aee596cf7c5f70fd3ea00b8e86901a6
-SIZE (webkit-1.3.2.tar.gz) = 7804332
+MD5 (webkit-1.3.3.tar.gz) = 22af6591b124610a8df55c7a87989349
+SHA256 (webkit-1.3.3.tar.gz) = 6520c80aa9b444ca882ee3dbe11b445d5d34bca837a6fcd46eccaf66301e6e08
+SIZE (webkit-1.3.3.tar.gz) = 7306862
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_resources_error.html b/www/webkit-gtk2/files/patch-WebKit_gtk_resources_error.html
new file mode 100644
index 000000000..292fc47b6
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_resources_error.html
@@ -0,0 +1,17 @@
+--- WebKit/gtk/resources/error.html.orig
++++ WebKit/gtk/resources/error.html
+@@ -21,12 +21,12 @@
+ }
+ 
+ #errorTitleText {
+- font-size: 120%;
++ font-size: 120%%;
+  font-weight: bold;
+ }
+ 
+ #errorMessageText {
+- font-size: 80%;
++ font-size: 80%%;
+ }
+ 
+ </style>
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 127024e5e..2cd5f2ace 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -36,7 +36,6 @@ include/webkit-1.0/webkit/WebKitDOMEvent.h
 include/webkit-1.0/webkit/WebKitDOMEventTarget.h
 include/webkit-1.0/webkit/WebKitDOMFile.h
 include/webkit-1.0/webkit/WebKitDOMFileList.h
-include/webkit-1.0/webkit/WebKitDOMGeolocation.h
 include/webkit-1.0/webkit/WebKitDOMHTMLAnchorElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLAppletElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLAreaElement.h
@@ -102,8 +101,8 @@ include/webkit-1.0/webkit/WebKitDOMLocation.h
 include/webkit-1.0/webkit/WebKitDOMMediaList.h
 include/webkit-1.0/webkit/WebKitDOMMemoryInfo.h
 include/webkit-1.0/webkit/WebKitDOMMessagePort.h
-include/webkit-1.0/webkit/WebKitDOMMimeType.h
-include/webkit-1.0/webkit/WebKitDOMMimeTypeArray.h
+include/webkit-1.0/webkit/WebKitDOMDOMMimeType.h
+include/webkit-1.0/webkit/WebKitDOMDOMMimeTypeArray.h
 include/webkit-1.0/webkit/WebKitDOMNamedNodeMap.h
 include/webkit-1.0/webkit/WebKitDOMNavigator.h
 include/webkit-1.0/webkit/WebKitDOMNode.h
@@ -111,11 +110,12 @@ include/webkit-1.0/webkit/WebKitDOMNodeFilter.h
 include/webkit-1.0/webkit/WebKitDOMNodeIterator.h
 include/webkit-1.0/webkit/WebKitDOMNodeList.h
 include/webkit-1.0/webkit/WebKitDOMObject.h
-include/webkit-1.0/webkit/WebKitDOMPlugin.h
-include/webkit-1.0/webkit/WebKitDOMPluginArray.h
+include/webkit-1.0/webkit/WebKitDOMDOMPlugin.h
+include/webkit-1.0/webkit/WebKitDOMDOMPluginArray.h
 include/webkit-1.0/webkit/WebKitDOMProcessingInstruction.h
 include/webkit-1.0/webkit/WebKitDOMRange.h
 include/webkit-1.0/webkit/WebKitDOMScreen.h
+include/webkit-1.0/webkit/WebKitDOMDOMStringMap.h
 include/webkit-1.0/webkit/WebKitDOMStorage.h
 include/webkit-1.0/webkit/WebKitDOMStyleMedia.h
 include/webkit-1.0/webkit/WebKitDOMStyleSheet.h
@@ -158,30 +158,31 @@ lib/libwebkitgtk-1.0.la
 lib/libwebkitgtk-1.0.so
 lib/libwebkitgtk-1.0.so.13
 libdata/pkgconfig/webkit-1.0.pc
-share/locale/cs/LC_MESSAGES/webkit-1.0.mo
-share/locale/de/LC_MESSAGES/webkit-1.0.mo
-share/locale/en_GB/LC_MESSAGES/webkit-1.0.mo
-share/locale/es/LC_MESSAGES/webkit-1.0.mo
-share/locale/et/LC_MESSAGES/webkit-1.0.mo
-share/locale/gl/LC_MESSAGES/webkit-1.0.mo
-share/locale/gu/LC_MESSAGES/webkit-1.0.mo
-share/locale/he/LC_MESSAGES/webkit-1.0.mo
-share/locale/it/LC_MESSAGES/webkit-1.0.mo
-share/locale/lt/LC_MESSAGES/webkit-1.0.mo
-share/locale/lv/LC_MESSAGES/webkit-1.0.mo
-share/locale/nl/LC_MESSAGES/webkit-1.0.mo
-share/locale/pa/LC_MESSAGES/webkit-1.0.mo
-share/locale/pt/LC_MESSAGES/webkit-1.0.mo
-share/locale/pt_BR/LC_MESSAGES/webkit-1.0.mo
-share/locale/ru/LC_MESSAGES/webkit-1.0.mo
-share/locale/sl/LC_MESSAGES/webkit-1.0.mo
-share/locale/sr/LC_MESSAGES/webkit-1.0.mo
-share/locale/sr@latin/LC_MESSAGES/webkit-1.0.mo
-share/locale/sv/LC_MESSAGES/webkit-1.0.mo
-share/locale/uk/LC_MESSAGES/webkit-1.0.mo
-share/locale/vi/LC_MESSAGES/webkit-1.0.mo
-share/locale/zh_CN/LC_MESSAGES/webkit-1.0.mo
+share/locale/cs/LC_MESSAGES/webkit-2.0.mo
+share/locale/de/LC_MESSAGES/webkit-2.0.mo
+share/locale/en_GB/LC_MESSAGES/webkit-2.0.mo
+share/locale/es/LC_MESSAGES/webkit-2.0.mo
+share/locale/et/LC_MESSAGES/webkit-2.0.mo
+share/locale/gl/LC_MESSAGES/webkit-2.0.mo
+share/locale/gu/LC_MESSAGES/webkit-2.0.mo
+share/locale/he/LC_MESSAGES/webkit-2.0.mo
+share/locale/it/LC_MESSAGES/webkit-2.0.mo
+share/locale/lt/LC_MESSAGES/webkit-2.0.mo
+share/locale/lv/LC_MESSAGES/webkit-2.0.mo
+share/locale/nl/LC_MESSAGES/webkit-2.0.mo
+share/locale/pa/LC_MESSAGES/webkit-2.0.mo
+share/locale/pt/LC_MESSAGES/webkit-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/webkit-2.0.mo
+share/locale/ru/LC_MESSAGES/webkit-2.0.mo
+share/locale/sl/LC_MESSAGES/webkit-2.0.mo
+share/locale/sr/LC_MESSAGES/webkit-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/webkit-2.0.mo
+share/locale/sv/LC_MESSAGES/webkit-2.0.mo
+share/locale/uk/LC_MESSAGES/webkit-2.0.mo
+share/locale/vi/LC_MESSAGES/webkit-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/webkit-2.0.mo
 share/webkit-1.0/images/deleteButton.png
+share/webkit-1.0/images/inputSpeech.png
 share/webkit-1.0/images/missingImage.png
 share/webkit-1.0/images/nullPlugin.png
 share/webkit-1.0/images/panIcon.png
@@ -189,6 +190,7 @@ share/webkit-1.0/images/textAreaResizeCorner.png
 share/webkit-1.0/images/urlIcon.png
 share/webkit-1.0/resources/error.html
 share/webkit-1.0/webinspector/AbstractTimelinePanel.js
+share/webkit-1.0/webinspector/ApplicationCacheItemsView.js
 share/webkit-1.0/webinspector/AuditCategories.js
 share/webkit-1.0/webinspector/AuditLauncherView.js
 share/webkit-1.0/webinspector/AuditResultView.js
@@ -224,6 +226,7 @@ share/webkit-1.0/webinspector/FontView.js
 share/webkit-1.0/webinspector/HAREntry.js
 share/webkit-1.0/webinspector/HelpScreen.js
 share/webkit-1.0/webinspector/ImageView.js
+share/webkit-1.0/webinspector/Images/applicationCache.png
 share/webkit-1.0/webinspector/Images/auditsIcon.png
 share/webkit-1.0/webinspector/Images/back.png
 share/webkit-1.0/webinspector/Images/breakpointBorder.png
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index c946968c6..01cebe760 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.2 2010/07/13 09:56:34 kwm Exp $
+#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.3 2010/07/13 10:51:58 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.3
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk3
@@ -17,6 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An opensource browser engine
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
 		curl.6:${PORTSDIR}/ftp/curl \
@@ -39,6 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		ac_cv_path_GPERF="${LOCALBASE}/bin/gperf" \
 		ac_cv_path_DOLT_BASH=""
 CONFIGURE_ARGS=	--enable-icon-database \
+		--enable-introspection \
 		--enable-svg \
 		--enable-svg-fonts \
 		--with-gtk=3.0
@@ -53,8 +54,8 @@ OPTIONS=	VIDEO "Enable video support" on \
 
 .include <bsd.port.pre.mk>
 
-.if exists (${LOCALBASE}/lib/libicutu.so.43)
-LIB_DEPENDS+=	icutu.43:${PORTSDIR}/devel/icu4
+.if exists (${LOCALBASE}/lib/libicutu.so.44)
+LIB_DEPENDS+=	icutu.44:${PORTSDIR}/devel/icu4
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-WebCore_platform_text_TextBreakIterator.h
 .else
 LIB_DEPENDS+=	icutu.38:${PORTSDIR}/devel/icu
@@ -91,8 +92,6 @@ post-patch:
 		${WRKSRC}/WebCore/make-hash-tools.pl \
 		${WRKSRC}/WebCore/css/makevalues.pl \
 		${WRKSRC}/WebCore/css/makeprop.pl
-	@${REINPLACE_CMD} -e 's|GETTEXT_PACKAGE=$$PACKAGE|GETTEXT_PACKAGE=$$PACKAGE-3.0|g' \
-		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 .if !defined(WITH_STATIC)
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index 6d4c1dca0..3f584cbe1 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.3.2.tar.gz) = 8736b933d059288cdff9f9be64358954
-SHA256 (webkit-1.3.2.tar.gz) = b0f265a1f339f19855572ac6e18a2c1f6aee596cf7c5f70fd3ea00b8e86901a6
-SIZE (webkit-1.3.2.tar.gz) = 7804332
+MD5 (webkit-1.3.3.tar.gz) = 22af6591b124610a8df55c7a87989349
+SHA256 (webkit-1.3.3.tar.gz) = 6520c80aa9b444ca882ee3dbe11b445d5d34bca837a6fcd46eccaf66301e6e08
+SIZE (webkit-1.3.3.tar.gz) = 7306862
diff --git a/www/webkit-gtk3/files/patch-WebKit_gtk_resources_error.html b/www/webkit-gtk3/files/patch-WebKit_gtk_resources_error.html
new file mode 100644
index 000000000..292fc47b6
--- /dev/null
+++ b/www/webkit-gtk3/files/patch-WebKit_gtk_resources_error.html
@@ -0,0 +1,17 @@
+--- WebKit/gtk/resources/error.html.orig
++++ WebKit/gtk/resources/error.html
+@@ -21,12 +21,12 @@
+ }
+ 
+ #errorTitleText {
+- font-size: 120%;
++ font-size: 120%%;
+  font-weight: bold;
+ }
+ 
+ #errorMessageText {
+- font-size: 80%;
++ font-size: 80%%;
+ }
+ 
+ </style>
diff --git a/www/webkit-gtk3/files/patch-gtkregion-removal b/www/webkit-gtk3/files/patch-gtkregion-removal
deleted file mode 100644
index ed9d94f32..000000000
--- a/www/webkit-gtk3/files/patch-gtkregion-removal
+++ /dev/null
@@ -1,308 +0,0 @@
-From 1deabc22a79236001955f6f6082cac2249776ac2 Mon Sep 17 00:00:00 2001
-From: Xan Lopez <xlopez@igalia.com>
-Date: Thu, 1 Jul 2010 16:18:26 +0200
-Subject: [PATCH] WebCore:
-
-2010-07-01  Xan Lopez  <xlopez@igalia.com>
-
-        Reviewed by NOBODY (OOPS!).
-
-        [GTK] Stop using GdkRegion in 3.x mode
-        https://bugs.webkit.org/show_bug.cgi?id=41463
-
-        Make us compile without using GdkRegion, since it's gone from GTK+
-        3.x.
-
-        * platform/graphics/IntRect.h:
-        * platform/graphics/cairo/GraphicsContextCairo.cpp:
-        (WebCore::GraphicsContext::drawFocusRing):
-        * platform/graphics/gtk/FontGtk.cpp:
-        (WebCore::cairo_region_shrink):
-        (WebCore::Font::drawComplexText):
-        * platform/gtk/GtkPluginWidget.cpp:
-        (WebCore::GtkPluginWidget::paint):
-        * platform/gtk/RenderThemeGtk.h:
-        * platform/gtk/ScrollbarGtk.cpp:
-        (ScrollbarGtk::paint):
-
-WebKit/gtk:
-
-2010-07-01  Xan Lopez  <xlopez@igalia.com>
-
-        Reviewed by NOBODY (OOPS!).
-
-        [GTK] Stop using GdkRegion in 3.x mode
-        https://bugs.webkit.org/show_bug.cgi?id=41463
-
-        Make us compile without using GdkRegion, since it's gone from GTK+
-        3.x.
-
-        * WebCoreSupport/ChromeClientGtk.cpp:
-        (WebKit::ChromeClient::scroll):
-        * webkit/webkitwebview.cpp:
-        (webkit_web_view_expose_event):
----
- WebCore/ChangeLog                                  |   22 ++++++++++++
- WebCore/platform/graphics/IntRect.h                |    5 +++
- .../graphics/cairo/GraphicsContextCairo.cpp        |   14 +++++++
- WebCore/platform/graphics/gtk/FontGtk.cpp          |   37 +++++++++++++++++++-
- WebCore/platform/gtk/GtkPluginWidget.cpp           |    8 ++++
- WebCore/platform/gtk/RenderThemeGtk.h              |    5 +++
- WebCore/platform/gtk/ScrollbarGtk.cpp              |    8 ++++
- WebKit/gtk/ChangeLog                               |   15 ++++++++
- WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp      |   16 ++++++++
- WebKit/gtk/webkit/webkitwebview.cpp                |   10 ++++-
- 10 files changed, 137 insertions(+), 3 deletions(-)
-
-diff --git a/WebCore/platform/graphics/IntRect.h b/WebCore/platform/graphics/IntRect.h
-index ad90dd9..c5990ef 100644
---- WebCore/platform/graphics/IntRect.h
-+++ WebCore/platform/graphics/IntRect.h
-@@ -48,7 +48,12 @@ QT_BEGIN_NAMESPACE
- class QRect;
- QT_END_NAMESPACE
- #elif PLATFORM(GTK)
-+#ifdef GTK_API_VERSION_2
- typedef struct _GdkRectangle GdkRectangle;
-+#else
-+typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
-+typedef cairo_rectangle_int_t GdkRectangle;
-+#endif
- #elif PLATFORM(HAIKU)
- class BRect;
- #endif
-diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
-index dc32317..5521a6f 100644
---- WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
-+++ WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
-@@ -643,13 +643,27 @@ void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int
-     cairo_new_path(cr);
- 
- #if PLATFORM(GTK)
-+#ifdef GTK_API_VERSION_2
-     GdkRegion* reg = gdk_region_new();
-+#else
-+    cairo_region_t* reg = cairo_region_create();
-+#endif
-+
-     for (unsigned i = 0; i < rectCount; i++) {
-+#ifdef GTK_API_VERSION_2
-         GdkRectangle rect = rects[i];
-         gdk_region_union_with_rect(reg, &rect);
-+#else
-+        cairo_rectangle_int_t rect = rects[i];
-+        cairo_region_union_rectangle(reg, &rect);
-+#endif
-     }
-     gdk_cairo_region(cr, reg);
-+#ifdef GTK_API_VERSION_2
-     gdk_region_destroy(reg);
-+#else
-+    cairo_region_destroy(reg);
-+#endif
- 
-     setColor(cr, color);
-     cairo_set_line_width(cr, 2.0f);
-diff --git a/WebCore/platform/graphics/gtk/FontGtk.cpp b/WebCore/platform/graphics/gtk/FontGtk.cpp
-index fae84cb..e451b76 100644
---- WebCore/platform/graphics/gtk/FontGtk.cpp
-+++ WebCore/platform/graphics/gtk/FontGtk.cpp
-@@ -181,6 +181,29 @@ bool Font::canReturnFallbackFontsForComplexText()
-     return false;
- }
- 
-+#ifndef GTK_API_VERSION_2
-+static void cairo_region_shrink(cairo_region_t* region, int dx, int dy)
-+{
-+    int nRects = cairo_region_num_rectangles(region);
-+    /* clear region */
-+    cairo_region_subtract(region, region);
-+
-+    for (int i = 0; i < nRects; i++) {
-+        cairo_rectangle_int_t rect;
-+        cairo_region_get_rectangle(region, i, &rect);
-+
-+        if (rect.width <= 2 * dx || rect.height <= 2 * dy)
-+            continue;
-+
-+        rect.x += dx;
-+        rect.y += dy;
-+        rect.width -= 2 * dx;
-+        rect.height -= 2 * dy;
-+        cairo_region_union_rectangle(region, &rect);
-+    }
-+}
-+#endif
-+
- void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const FloatPoint& point, int from, int to) const
- {
-     cairo_t* cr = context->platformContext();
-@@ -196,14 +219,22 @@ void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const F
-     // Our layouts are single line
-     PangoLayoutLine* layoutLine = pango_layout_get_line_readonly(layout, 0);
- 
--    GdkRegion* partialRegion = NULL;
-+#ifdef GTK_API_VERSION_2
-+    GdkRegion* partialRegion = 0;
-+#else
-+    cairo_region_t* partialRegion = 0;
-+#endif
-     if (to - from != run.length()) {
-         // Clip the region of the run to be rendered
-         char* start = g_utf8_offset_to_pointer(utf8, from);
-         char* end = g_utf8_offset_to_pointer(start, to - from);
-         int ranges[] = {start - utf8, end - utf8};
-         partialRegion = gdk_pango_layout_line_get_clip_region(layoutLine, 0, 0, ranges, 1);
-+#ifdef GTK_API_VERSION_2
-         gdk_region_shrink(partialRegion, 0, -pixelSize());
-+#else
-+        cairo_region_shrink(partialRegion, 0, -pixelSize());
-+#endif
-     }
- 
-     Color fillColor = context->fillColor();
-@@ -265,7 +296,11 @@ void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const F
-     cairo_new_path(cr);
- 
-     if (partialRegion)
-+#ifdef GTK_API_VERSION_2
-         gdk_region_destroy(partialRegion);
-+#else
-+        cairo_region_destroy(partialRegion);
-+#endif
- 
-     g_free(utf8);
-     g_object_unref(layout);
-diff --git a/WebCore/platform/gtk/GtkPluginWidget.cpp b/WebCore/platform/gtk/GtkPluginWidget.cpp
-index 94382f1..331f60f 100644
---- WebCore/platform/gtk/GtkPluginWidget.cpp
-+++ WebCore/platform/gtk/GtkPluginWidget.cpp
-@@ -87,7 +87,11 @@ void GtkPluginWidget::paint(GraphicsContext* context, const IntRect& rect)
-     event->expose.area.x = loc.x();
-     event->expose.area.y = loc.y();
- 
-+#ifdef GTK_API_VERSION_2
-     event->expose.region = gdk_region_rectangle(&event->expose.area);
-+#else
-+    event->expose.region = cairo_region_create_rectangle(&event->expose.area);
-+#endif
- 
-     /*
-      * This will be unref'ed by gdk_event_free.
-@@ -97,7 +101,11 @@ void GtkPluginWidget::paint(GraphicsContext* context, const IntRect& rect)
-     /*
-      * If we are going to paint do the translation and GtkAllocation manipulation.
-      */
-+#ifdef GTK_API_VERSION_2
-     if (!gdk_region_empty(event->expose.region))
-+#else
-+    if (!cairo_region_is_empty(event->expose.region))
-+#endif
-         gtk_widget_send_expose(widget, event);
- 
-     gdk_event_free(event);
-diff --git a/WebCore/platform/gtk/RenderThemeGtk.h b/WebCore/platform/gtk/RenderThemeGtk.h
-index 3f02f0e..71338d4 100644
---- WebCore/platform/gtk/RenderThemeGtk.h
-+++ WebCore/platform/gtk/RenderThemeGtk.h
-@@ -34,7 +34,12 @@
- typedef struct _GtkWidget GtkWidget;
- typedef struct _GtkStyle GtkStyle;
- typedef struct _GtkContainer GtkContainer;
-+#ifdef GTK_API_VERSION_2
- typedef struct _GdkRectangle GdkRectangle;
-+#else
-+typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
-+typedef cairo_rectangle_int_t GdkRectangle;
-+#endif
- typedef struct _GdkDrawable GdkDrawable;
- typedef struct _GtkBorder GtkBorder;
- typedef struct _GtkThemeParts GtkThemeParts;
-diff --git a/WebCore/platform/gtk/ScrollbarGtk.cpp b/WebCore/platform/gtk/ScrollbarGtk.cpp
-index 5dc4dd6..8081fb8 100644
---- WebCore/platform/gtk/ScrollbarGtk.cpp
-+++ WebCore/platform/gtk/ScrollbarGtk.cpp
-@@ -238,7 +238,11 @@ void ScrollbarGtk::paint(GraphicsContext* context, const IntRect& rect)
-     event->expose.area.x = loc.x();
-     event->expose.area.y = loc.y();
- 
-+#ifdef GTK_API_VERSION_2
-     event->expose.region = gdk_region_rectangle(&event->expose.area);
-+#else
-+    event->expose.region = cairo_region_create_rectangle(&event->expose.area);
-+#endif
- 
-     /*
-      * This will be unref'ed by gdk_event_free.
-@@ -248,7 +252,11 @@ void ScrollbarGtk::paint(GraphicsContext* context, const IntRect& rect)
-     /*
-      * If we are going to paint do the translation and GtkAllocation manipulation.
-      */
-+#ifdef GTK_API_VERSION_2
-     if (!gdk_region_empty(event->expose.region))
-+#else
-+    if (!cairo_region_is_empty(event->expose.region))
-+#endif
-         gtk_widget_send_expose(widget, event);
- 
-     gdk_event_free(event);
-diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
-index fe5d9eb..bb469c5 100644
---- WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
-+++ WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
-@@ -372,6 +372,7 @@ void ChromeClient::scroll(const IntSize& delta, const IntRect& rectToScroll, con
-     sourceRect.x -= delta.width();
-     sourceRect.y -= delta.height();
- 
-+#ifdef GTK_API_VERSION_2
-     GdkRegion* invalidRegion = gdk_region_rectangle(&area);
- 
-     if (gdk_rectangle_intersect(&area, &sourceRect, &moveRect)) {
-@@ -384,6 +385,21 @@ void ChromeClient::scroll(const IntSize& delta, const IntRect& rectToScroll, con
- 
-     gdk_window_invalidate_region(window, invalidRegion, FALSE);
-     gdk_region_destroy(invalidRegion);
-+#else
-+    cairo_region_t* invalidRegion = cairo_region_create_rectangle(&area);
-+
-+    if (gdk_rectangle_intersect(&area, &sourceRect, &moveRect)) {
-+        cairo_region_t* moveRegion = cairo_region_create_rectangle(&moveRect);
-+        gdk_window_move_region(window, moveRegion, delta.width(), delta.height());
-+        cairo_region_translate(moveRegion, delta.width(), delta.height());
-+        cairo_region_subtract(invalidRegion, moveRegion);
-+        cairo_region_destroy(moveRegion);
-+    }
-+
-+    gdk_window_invalidate_region(window, invalidRegion, FALSE);
-+    cairo_region_destroy(invalidRegion);
-+#endif
-+
- }
- 
- // FIXME: this does not take into account the WM decorations
-diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
-index ff4aa8a..62997c5 100644
---- WebKit/gtk/webkit/webkitwebview.cpp
-+++ WebKit/gtk/webkit/webkitwebview.cpp
-@@ -517,10 +517,16 @@ static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose*
-         cairo_destroy(cr);
-         ctx.setGdkExposeEvent(event);
- 
--        GOwnPtr<GdkRectangle> rects;
-         int rectCount;
-+#ifdef GTK_API_VERSION_2
-+        GOwnPtr<GdkRectangle> rects;
-         gdk_region_get_rectangles(event->region, &rects.outPtr(), &rectCount);
--
-+#else
-+        rectCount = cairo_region_num_rectangles(event->region);
-+        GOwnPtr<GdkRectangle> rects(g_new(GdkRectangle, rectCount));
-+        for (int i = 0; i < rectCount; i++)
-+            cairo_region_get_rectangle(event->region, i, rects.get()+i);
-+#endif
-         // Avoid recursing into the render tree excessively
-         bool coalesce = shouldCoalesce(event->area, rects.get(), rectCount);
- 
--- 
-1.6.6.1
-
diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist
index fe1ecbdff..87ea9cad1 100644
--- a/www/webkit-gtk3/pkg-plist
+++ b/www/webkit-gtk3/pkg-plist
@@ -36,7 +36,6 @@ include/webkit-3.0/webkit/WebKitDOMEvent.h
 include/webkit-3.0/webkit/WebKitDOMEventTarget.h
 include/webkit-3.0/webkit/WebKitDOMFile.h
 include/webkit-3.0/webkit/WebKitDOMFileList.h
-include/webkit-3.0/webkit/WebKitDOMGeolocation.h
 include/webkit-3.0/webkit/WebKitDOMHTMLAnchorElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLAppletElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLAreaElement.h
@@ -102,8 +101,8 @@ include/webkit-3.0/webkit/WebKitDOMLocation.h
 include/webkit-3.0/webkit/WebKitDOMMediaList.h
 include/webkit-3.0/webkit/WebKitDOMMemoryInfo.h
 include/webkit-3.0/webkit/WebKitDOMMessagePort.h
-include/webkit-3.0/webkit/WebKitDOMMimeType.h
-include/webkit-3.0/webkit/WebKitDOMMimeTypeArray.h
+include/webkit-3.0/webkit/WebKitDOMDOMMimeType.h
+include/webkit-3.0/webkit/WebKitDOMDOMMimeTypeArray.h
 include/webkit-3.0/webkit/WebKitDOMNamedNodeMap.h
 include/webkit-3.0/webkit/WebKitDOMNavigator.h
 include/webkit-3.0/webkit/WebKitDOMNode.h
@@ -111,11 +110,12 @@ include/webkit-3.0/webkit/WebKitDOMNodeFilter.h
 include/webkit-3.0/webkit/WebKitDOMNodeIterator.h
 include/webkit-3.0/webkit/WebKitDOMNodeList.h
 include/webkit-3.0/webkit/WebKitDOMObject.h
-include/webkit-3.0/webkit/WebKitDOMPlugin.h
-include/webkit-3.0/webkit/WebKitDOMPluginArray.h
+include/webkit-3.0/webkit/WebKitDOMDOMPlugin.h
+include/webkit-3.0/webkit/WebKitDOMDOMPluginArray.h
 include/webkit-3.0/webkit/WebKitDOMProcessingInstruction.h
 include/webkit-3.0/webkit/WebKitDOMRange.h
 include/webkit-3.0/webkit/WebKitDOMScreen.h
+include/webkit-3.0/webkit/WebKitDOMDOMStringMap.h
 include/webkit-3.0/webkit/WebKitDOMStorage.h
 include/webkit-3.0/webkit/WebKitDOMStyleMedia.h
 include/webkit-3.0/webkit/WebKitDOMStyleSheet.h
@@ -153,11 +153,15 @@ include/webkit-3.0/webkit/webkitwebresource.h
 include/webkit-3.0/webkit/webkitwebsettings.h
 include/webkit-3.0/webkit/webkitwebview.h
 include/webkit-3.0/webkit/webkitwebwindowfeatures.h
+lib/girepository-1.0/JSCore-3.0.typelib
+lib/girepository-1.0/WebKit-3.0.typelib
 %%STATIC%%lib/libwebkitgtk-3.0.a
 lib/libwebkitgtk-3.0.la
 lib/libwebkitgtk-3.0.so
 lib/libwebkitgtk-3.0.so.0
 libdata/pkgconfig/webkitgtk-3.0.pc
+share/gir-1.0/JSCore-3.0.gir
+share/gir-1.0/WebKit-3.0.gir
 share/locale/cs/LC_MESSAGES/webkit-3.0.mo
 share/locale/de/LC_MESSAGES/webkit-3.0.mo
 share/locale/en_GB/LC_MESSAGES/webkit-3.0.mo
@@ -182,6 +186,7 @@ share/locale/uk/LC_MESSAGES/webkit-3.0.mo
 share/locale/vi/LC_MESSAGES/webkit-3.0.mo
 share/locale/zh_CN/LC_MESSAGES/webkit-3.0.mo
 share/webkit-3.0/images/deleteButton.png
+share/webkit-3.0/images/inputSpeech.png
 share/webkit-3.0/images/missingImage.png
 share/webkit-3.0/images/nullPlugin.png
 share/webkit-3.0/images/panIcon.png
@@ -189,6 +194,7 @@ share/webkit-3.0/images/textAreaResizeCorner.png
 share/webkit-3.0/images/urlIcon.png
 share/webkit-3.0/resources/error.html
 share/webkit-3.0/webinspector/AbstractTimelinePanel.js
+share/webkit-3.0/webinspector/ApplicationCacheItemsView.js
 share/webkit-3.0/webinspector/AuditCategories.js
 share/webkit-3.0/webinspector/AuditLauncherView.js
 share/webkit-3.0/webinspector/AuditResultView.js
@@ -224,6 +230,7 @@ share/webkit-3.0/webinspector/FontView.js
 share/webkit-3.0/webinspector/HAREntry.js
 share/webkit-3.0/webinspector/HelpScreen.js
 share/webkit-3.0/webinspector/ImageView.js
+share/webkit-3.0/webinspector/Images/applicationCache.png
 share/webkit-3.0/webinspector/Images/auditsIcon.png
 share/webkit-3.0/webinspector/Images/back.png
 share/webkit-3.0/webinspector/Images/breakpointBorder.png