Update to 1.3.10.

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

7 files changed, 23 insertions, 50 deletions

diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 0f0503af9..3ae2d48fe 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.7 2010/12/26 10:44:08 kwm Exp $
+#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.8 2010/12/26 10:55:54 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.10
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk3
@@ -73,19 +73,19 @@ CFLAGS+= -mminimal-toc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
-		${WRKSRC}/WebCore/plugins/PluginDatabase.cpp
+		${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
 	@${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 # disable static library. 
 	@${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \
 		${WRKDIR}/gnome-libtool
 	@${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \
-		${WRKSRC}/WebCore/dom/make_names.pl \
-		${WRKSRC}/WebCore/css/make-css-file-arrays.pl \
-		${WRKSRC}/WebCore/bindings/scripts/IDLParser.pm
+		${WRKSRC}/Source/WebCore/dom/make_names.pl \
+		${WRKSRC}/Source/WebCore/css/make-css-file-arrays.pl \
+		${WRKSRC}/Source/WebCore/bindings/scripts/IDLParser.pm
 	@${REINPLACE_CMD} -e 's|"gperf|"${LOCALBASE}/bin/gperf|g' \
-		${WRKSRC}/WebCore/css/makevalues.pl \
-		${WRKSRC}/WebCore/css/makeprop.pl \
-		${WRKSRC}/WebCore/make-hash-tools.pl
+		${WRKSRC}/Source/WebCore/css/makevalues.pl \
+		${WRKSRC}/Source/WebCore/css/makeprop.pl \
+		${WRKSRC}/Source/WebCore/make-hash-tools.pl
 
 .include <bsd.port.post.mk>
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index 7139fb80d..f3e079957 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.3.9.tar.gz) = 2d67836d8bc3e327e5cf762e3b2d2096438881750f481b879c6544f29c442f86
-SIZE (webkit-1.3.9.tar.gz) = 8821122
+SHA256 (webkit-1.3.10.tar.gz) = 1d383a33b30b4cddd47ab2517d3bafe313c036d4f690b42f6b1f7a9ac9de46be
+SIZE (webkit-1.3.10.tar.gz) = 8471415
diff --git a/www/webkit-gtk3/files/patch-JavaScriptCore-runtime_JSValue.h b/www/webkit-gtk3/files/patch-Source_JavaScriptCore_runtime_JSValue.h
index 9c32953b9..ad04935a0 100644
--- a/www/webkit-gtk3/files/patch-JavaScriptCore-runtime_JSValue.h
+++ b/www/webkit-gtk3/files/patch-Source_JavaScriptCore_runtime_JSValue.h
@@ -1,6 +1,6 @@
---- JavaScriptCore/runtime/JSValue.h.orig	2010-02-05 17:26:52.000000000 +0100
-+++ JavaScriptCore/runtime/JSValue.h	2010-03-25 21:43:11.000000000 +0100
-@@ -491,7 +491,11 @@ namespace JSC {
+--- Source/JavaScriptCore/runtime/JSValue.h.orig	2011-01-03 22:55:02.000000000 +0000
++++ Source/JavaScriptCore/runtime/JSValue.h	2011-01-11 16:34:27.000000000 +0000
+@@ -434,7 +434,11 @@ namespace JSC {
              u.asBits.tag = CellTag;
          else
              u.asBits.tag = EmptyValueTag;
diff --git a/www/webkit-gtk3/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk3/files/patch-Source_WebCore_plugins_PluginDatabase.cpp
index 2670c229d..26508336a 100644
--- a/www/webkit-gtk3/files/patch-Webcore_plugins_PluginDatabase.cpp
+++ b/www/webkit-gtk3/files/patch-Source_WebCore_plugins_PluginDatabase.cpp
@@ -1,6 +1,6 @@
---- WebCore/plugins/PluginDatabase.cpp.orig	2008-11-02 03:12:05.000000000 +0800
-+++ WebCore/plugins/PluginDatabase.cpp	2009-05-19 15:09:51.000000000 +0800
-@@ -283,6 +283,7 @@ Vector<String> PluginDatabase::defaultPl
+--- Source/WebCore/plugins/PluginDatabase.cpp.orig	2011-01-11 16:24:29.000000000 +0000
++++ Source/WebCore/plugins/PluginDatabase.cpp	2011-01-11 16:24:54.000000000 +0000
+@@ -375,6 +375,7 @@ Vector<String> PluginDatabase::defaultPl
      userPluginPath.append(String("/.netscape/plugins"));
      paths.append(userPluginPath);
  
diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PluginViewGtk.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PluginViewGtk.cpp
deleted file mode 100644
index 32688aa3e..000000000
--- a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PluginViewGtk.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2010-12-16 23:38:27.000000000 +0000
-+++ WebCore/plugins/gtk/PluginViewGtk.cpp	2010-12-16 23:39:05.000000000 +0000
-@@ -114,7 +114,7 @@ static Window getRootWindow(Frame* paren
- {
-     GtkWidget* parentWidget = parentFrame->view()->hostWindow()->platformPageClient();
-     GdkScreen* gscreen = gtk_widget_get_screen(parentWidget);
--    return GDK_WINDOW_XWINDOW(gdk_screen_get_root_window(gscreen));
-+    return GDK_WINDOW_XID(gdk_screen_get_root_window(gscreen));
- }
- #endif
- 
-@@ -325,7 +325,7 @@ void PluginView::initXEvent(XEvent* xEve
-     // but does in the case of KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify
-     // events; thus, this is right:
-     GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
--    xEvent->xany.window = widget ? GDK_WINDOW_XWINDOW(gtk_widget_get_window(widget)) : 0;
-+    xEvent->xany.window = widget ? GDK_WINDOW_XID(gtk_widget_get_window(widget)) : 0;
- }
- 
- static void setXButtonEventSpecificFields(XEvent* xEvent, MouseEvent* event, const IntPoint& postZoomPos, Frame* parentFrame)
-@@ -635,7 +635,7 @@ bool PluginView::platformGetValue(NPNVar
- #if defined(XP_UNIX)
-             void* w = reinterpret_cast<void*>(value);
-             GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
--            *((XID *)w) = GDK_WINDOW_XWINDOW(gtk_widget_get_window(widget));
-+            *((XID *)w) = GDK_WINDOW_XID(gtk_widget_get_window(widget));
- #endif
- #ifdef GDK_WINDOWING_WIN32
-             HGDIOBJ* w = reinterpret_cast<HGDIOBJ*>(value);
diff --git a/www/webkit-gtk3/files/patch-cairo b/www/webkit-gtk3/files/patch-cairo
index 2c4293af5..2f928af19 100644
--- a/www/webkit-gtk3/files/patch-cairo
+++ b/www/webkit-gtk3/files/patch-cairo
@@ -1,6 +1,6 @@
---- WebCore/platform/graphics/BitmapImage.cpp.orig	2009-03-04 03:34:16.000000000 +0800
-+++ WebCore/platform/graphics/BitmapImage.cpp	2009-05-19 15:09:51.000000000 +0800
-@@ -202,7 +202,7 @@ bool BitmapImage::isSizeAvailable()
+--- Source/WebCore/platform/graphics/BitmapImage.cpp.orig	2011-01-08 16:50:57.000000000 +0000
++++ Source/WebCore/platform/graphics/BitmapImage.cpp	2011-01-11 16:36:22.000000000 +0000
+@@ -207,7 +207,7 @@ bool BitmapImage::isSizeAvailable()
  NativeImagePtr BitmapImage::frameAtIndex(size_t index)
  {
      if (index >= frameCount())
diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist
index cb1759462..5265f4b2b 100644
--- a/www/webkit-gtk3/pkg-plist
+++ b/www/webkit-gtk3/pkg-plist
@@ -146,6 +146,7 @@ include/webkit-3.0/webkit/webkitdownload.h
 include/webkit-3.0/webkit/webkitenumtypes.h
 include/webkit-3.0/webkit/webkiterror.h
 include/webkit-3.0/webkit/webkitgeolocationpolicydecision.h
+include/webkit-3.0/webkit/webkitglobals.h
 include/webkit-3.0/webkit/webkithittestresult.h
 include/webkit-3.0/webkit/webkitnetworkrequest.h
 include/webkit-3.0/webkit/webkitnetworkresponse.h
@@ -394,6 +395,7 @@ share/webkitgtk-3.0/webinspector/KeyboardShortcut.js
 share/webkitgtk-3.0/webinspector/MetricsSidebarPane.js
 share/webkitgtk-3.0/webinspector/NetworkItemView.js
 share/webkitgtk-3.0/webinspector/NetworkPanel.js
+share/webkitgtk-3.0/webinspector/NetworkManager.js
 share/webkitgtk-3.0/webinspector/Object.js
 share/webkitgtk-3.0/webinspector/ObjectPropertiesSection.js
 share/webkitgtk-3.0/webinspector/Panel.js
@@ -410,8 +412,8 @@ share/webkitgtk-3.0/webinspector/Resource.js
 share/webkitgtk-3.0/webinspector/ResourceCategory.js
 share/webkitgtk-3.0/webinspector/ResourceCookiesView.js
 share/webkitgtk-3.0/webinspector/ResourceHeadersView.js
-share/webkitgtk-3.0/webinspector/ResourceManager.js
 share/webkitgtk-3.0/webinspector/ResourceTimingView.js
+share/webkitgtk-3.0/webinspector/ResourceTreeModel.js
 share/webkitgtk-3.0/webinspector/ResourceView.js
 share/webkitgtk-3.0/webinspector/ResourcesPanel.js
 share/webkitgtk-3.0/webinspector/ScopeChainSidebarPane.js