Update to 1.3.9.

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

8 files changed, 10 insertions, 102 deletions

diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 0731eb907..18ff83fd4 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.6 2010/12/17 12:46:23 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.7
+PORTVERSION=	1.3.9
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk3
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index ba2d80ae3..7139fb80d 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.3.7.tar.gz) = 937c75610108d09f9ac35aa120937cb193bc78a409c5fbfc439930a65a054652
-SIZE (webkit-1.3.7.tar.gz) = 9797065
+SHA256 (webkit-1.3.9.tar.gz) = 2d67836d8bc3e327e5cf762e3b2d2096438881750f481b879c6544f29c442f86
+SIZE (webkit-1.3.9.tar.gz) = 8821122
diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_GraphicsContext.h b/www/webkit-gtk3/files/patch-WebCore_platform_graphics_GraphicsContext.h
deleted file mode 100644
index 0f8bd55c6..000000000
--- a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_GraphicsContext.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- WebCore/platform/graphics/GraphicsContext.h.orig	2010-12-16 21:46:30.000000000 +0000
-+++ WebCore/platform/graphics/GraphicsContext.h	2010-12-16 22:05:45.000000000 +0000
-@@ -90,7 +90,7 @@ typedef void PlatformGraphicsContext;
- #endif
- 
- #if PLATFORM(GTK)
--typedef struct _GdkDrawable GdkDrawable;
-+typedef struct _GdkWindow GdkWindow;
- typedef struct _GdkEventExpose GdkEventExpose;
- #endif
- 
-@@ -405,7 +405,7 @@ namespace WebCore {
- 
- #if PLATFORM(GTK)
-         void setGdkExposeEvent(GdkEventExpose*);
--        GdkDrawable* gdkDrawable() const;
-+	GdkWindow* gdkWindow() const;
-         GdkEventExpose* gdkExposeEvent() const;
- #endif
- 
diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_cairo_GrahpicsContextCairo.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_graphics_cairo_GrahpicsContextCairo.cpp
deleted file mode 100644
index 77ad80825..000000000
--- a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_cairo_GrahpicsContextCairo.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp.orig	2010-12-16 21:44:44.000000000 +0000
-+++ WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp	2010-12-16 21:45:54.000000000 +0000
-@@ -1121,12 +1121,12 @@ GdkEventExpose* GraphicsContext::gdkExpo
-     return m_data->expose;
- }
- 
--GdkDrawable* GraphicsContext::gdkDrawable() const
-+GdkWindow* GraphicsContext::gdkWindow() const
- {
-     if (!m_data->expose)
-         return 0;
- 
--    return GDK_DRAWABLE(m_data->expose->window);
-+    return m_data->expose->window;
- }
- #endif
- 
diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PlatformScreenGtk.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PlatformScreenGtk.cpp
deleted file mode 100644
index e6956f59b..000000000
--- a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PlatformScreenGtk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- WebCore/platform/gtk/PlatformScreenGtk.cpp.orig	2010-12-16 23:22:44.000000000 +0000
-+++ WebCore/platform/gtk/PlatformScreenGtk.cpp	2010-12-16 23:33:34.000000000 +0000
-@@ -121,7 +121,7 @@ FloatRect screenAvailableRect(Widget* wi
-     if (!gtk_widget_get_realized(container))
-         return screenRect(widget);
- 
--    GdkDrawable* rootWindow = GDK_DRAWABLE(gtk_widget_get_root_window(container));
-+    GdkWindow* rootWindow = gtk_widget_get_root_window(container);
-     GdkDisplay* display = gdk_window_get_display(rootWindow);
-     Atom xproperty = gdk_x11_get_xatom_by_name_for_display(display, "_NET_WORKAREA");
- 
-@@ -130,7 +130,7 @@ FloatRect screenAvailableRect(Widget* wi
-     long *workAreaPos = NULL;
-     unsigned long retNItems;
-     unsigned long retAfter;
--    int xRes = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XWINDOW(rootWindow), xproperty,
-+    int xRes = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XID(rootWindow), xproperty,
-         0, 4, FALSE, XA_CARDINAL, &retType, &retFormat, &retNItems, &retAfter, (guchar**)&workAreaPos);
- 
-     FloatRect rect;
diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_WidgetGtk.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_gtk_WidgetGtk.cpp
deleted file mode 100644
index 5f5f8cdaf..000000000
--- a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_WidgetGtk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- WebCore/platform/gtk/WidgetGtk.cpp.orig	2010-12-16 23:35:42.000000000 +0000
-+++ WebCore/platform/gtk/WidgetGtk.cpp	2010-12-16 23:36:29.000000000 +0000
-@@ -60,7 +60,7 @@ void Widget::setFocus(bool focused)
-         gtk_widget_grab_focus(platformWidget() ? platformWidget() : GTK_WIDGET(root()->hostWindow()->platformPageClient()));
- }
- 
--static GdkDrawable* gdkDrawable(PlatformWidget widget)
-+static GdkWindow* gdkWindow(PlatformWidget widget)
- {
-     return widget ? gtk_widget_get_window(widget) : 0;
- }
-@@ -78,7 +78,7 @@ void Widget::setCursor(const Cursor& cur
-     if (platformCursor == lastSetCursor)
-         return;
- 
--    gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
-+    gdk_window_set_cursor(gdkWindow(platformWidget()) ? GDK_WINDOW(platformWidget()) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
-     lastSetCursor = platformCursor;
- }
- 
diff --git a/www/webkit-gtk3/files/patch-WebCore_plugins_gtk_gtk2xtbin.c b/www/webkit-gtk3/files/patch-WebCore_plugins_gtk_gtk2xtbin.c
deleted file mode 100644
index c278e2a88..000000000
--- a/www/webkit-gtk3/files/patch-WebCore_plugins_gtk_gtk2xtbin.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- WebCore/plugins/gtk/gtk2xtbin.c.orig	2010-12-16 23:40:35.000000000 +0000
-+++ WebCore/plugins/gtk/gtk2xtbin.c	2010-12-16 23:45:40.000000000 +0000
-@@ -285,7 +285,7 @@ gtk_xtbin_realize (GtkWidget *widget)
-   xtbin = GTK_XTBIN (widget);
- 
-   /* caculate the allocation before realize */
--  gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h, &d);
-+  gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h);
-   allocation.width = w;
-   allocation.height = h;
-   gtk_widget_size_allocate (widget, &allocation);
-@@ -346,7 +346,7 @@ gtk_xtbin_new (GtkWidget *parent_widget,
-   screen = gtk_widget_get_screen(parent_widget);
-   visual = gdk_screen_get_system_visual(screen);
-   colormap = XCreateColormap(GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen)),
--                             GDK_WINDOW_XWINDOW(gdk_screen_get_root_window(screen)),
-+                             GDK_WINDOW_XID(gdk_screen_get_root_window(screen)),
-                              GDK_VISUAL_XVISUAL(visual), AllocNone);
- 
-   xt_client_init(&(xtbin->xtclient), 
diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist
index cffcf9084..cb1759462 100644
--- a/www/webkit-gtk3/pkg-plist
+++ b/www/webkit-gtk3/pkg-plist
@@ -55,6 +55,7 @@ include/webkit-3.0/webkit/WebKitDOMHTMLBodyElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLButtonElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLCanvasElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLCollection.h
+include/webkit-3.0/webkit/WebKitDOMHTMLDetailsElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLDListElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLDirectoryElement.h
 include/webkit-3.0/webkit/WebKitDOMHTMLDivElement.h
@@ -151,6 +152,7 @@ include/webkit-3.0/webkit/webkitnetworkresponse.h
 include/webkit-3.0/webkit/webkitsecurityorigin.h
 include/webkit-3.0/webkit/webkitsoupauthdialog.h
 include/webkit-3.0/webkit/webkitversion.h
+include/webkit-3.0/webkit/webkitviewportattributes.h
 include/webkit-3.0/webkit/webkitwebbackforwardlist.h
 include/webkit-3.0/webkit/webkitwebdatabase.h
 include/webkit-3.0/webkit/webkitwebdatasource.h
@@ -158,6 +160,8 @@ include/webkit-3.0/webkit/webkitwebframe.h
 include/webkit-3.0/webkit/webkitwebhistoryitem.h
 include/webkit-3.0/webkit/webkitwebinspector.h
 include/webkit-3.0/webkit/webkitwebnavigationaction.h
+include/webkit-3.0/webkit/webkitwebplugin.h
+include/webkit-3.0/webkit/webkitwebplugindatabase.h
 include/webkit-3.0/webkit/webkitwebpolicydecision.h
 include/webkit-3.0/webkit/webkitwebresource.h
 include/webkit-3.0/webkit/webkitwebsettings.h
@@ -187,12 +191,12 @@ share/webkitgtk-3.0/webinspector/AuditResultView.js
 share/webkitgtk-3.0/webinspector/AuditRules.js
 share/webkitgtk-3.0/webinspector/AuditsPanel.js
 share/webkitgtk-3.0/webinspector/BottomUpProfileDataGridTree.js
+share/webkitgtk-3.0/webinspector/Breakpoint.js
 share/webkitgtk-3.0/webinspector/BreakpointManager.js
 share/webkitgtk-3.0/webinspector/BreakpointsSidebarPane.js
 share/webkitgtk-3.0/webinspector/CSSCompletions.js
 share/webkitgtk-3.0/webinspector/CSSStyleModel.js
 share/webkitgtk-3.0/webinspector/CallStackSidebarPane.js
-share/webkitgtk-3.0/webinspector/Callback.js
 share/webkitgtk-3.0/webinspector/ChangesView.js
 share/webkitgtk-3.0/webinspector/Checkbox.js
 share/webkitgtk-3.0/webinspector/Color.js
@@ -210,6 +214,7 @@ share/webkitgtk-3.0/webinspector/DataGrid.js
 share/webkitgtk-3.0/webinspector/Database.js
 share/webkitgtk-3.0/webinspector/DatabaseQueryView.js
 share/webkitgtk-3.0/webinspector/DatabaseTableView.js
+share/webkitgtk-3.0/webinspector/DebuggerModel.js
 share/webkitgtk-3.0/webinspector/Drawer.js
 share/webkitgtk-3.0/webinspector/ElementsPanel.js
 share/webkitgtk-3.0/webinspector/ElementsTreeOutline.js