Update to 1.1.18.

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

5 files changed, 30 insertions, 22 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index ed3383748..0eb39751b 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.52 2009/12/25 14:52:56 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.1.17
+PORTVERSION=	1.1.18
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
@@ -69,7 +69,8 @@ PLIST_SUB+=	STATIC="@comment "
 .endif
 
 .if ${OSVERSION} < 700000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \
+		${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
 .endif
 
 post-patch:
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 1383e66a9..b9a85b01b 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.1.17.tar.gz) = 9609c9b0f54c9f044177702d6006c359
-SHA256 (webkit-1.1.17.tar.gz) = 55a9fcccca7f22dcbfd018c157a1aa95b5bf3ec9407b0d2b522fa3e5308fce2a
-SIZE (webkit-1.1.17.tar.gz) = 6530345
+MD5 (webkit-1.1.18.tar.gz) = 10e52c30837fe0e2ac663fcb4290e1d3
+SHA256 (webkit-1.1.18.tar.gz) = 8ce50fc241e8f0a3bfaec9d0dda191499ad3f70463c9ba9a6b1a6f7e49e2c469
+SIZE (webkit-1.1.18.tar.gz) = 6745038
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
new file mode 100644
index 000000000..8bb6f17ce
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig	2010-01-14 15:19:17.000000000 +0000
++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h	2010-01-14 15:21:00.000000000 +0000
+@@ -74,7 +74,7 @@ public:
+      // Error:  #694: reinterpret_cast cannot cast away const or other type qualifiers
+         : m_value((void*)(value))
+ #else
+-        : m_value(reinterpret_cast<void*>(value))
++        : m_value((void*)(value))
+ #endif
+     {
+         ASSERT_VALID_CODE_POINTER(m_value);
diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
deleted file mode 100644
index 8152d2dd9..000000000
--- a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- JavaScriptCore/wtf/Platform.h.orig	2009-11-30 14:45:16.000000000 +0100
-+++ JavaScriptCore/wtf/Platform.h	2009-12-08 17:26:29.000000000 +0100
-@@ -757,7 +757,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
-+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS) || PLATFORM(FREEBSD))
- #define WTF_USE_JSVALUE64 1
- #elif PLATFORM(ARM) || PLATFORM(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 0ee03428c..5c2f64a7b 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -58,15 +58,20 @@ 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/AuditLauncherView.js
+share/webkit-1.0/webinspector/AuditResultView.js
+share/webkit-1.0/webinspector/AuditsPanel.js
 share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
 share/webkit-1.0/webinspector/Breakpoint.js
 share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
+share/webkit-1.0/webinspector/CSSSourceSyntaxHighlighter.js
 share/webkit-1.0/webinspector/CallStackSidebarPane.js
 share/webkit-1.0/webinspector/Callback.js
 share/webkit-1.0/webinspector/ChangesView.js
 share/webkit-1.0/webinspector/Color.js
 share/webkit-1.0/webinspector/ConsolePanel.js
 share/webkit-1.0/webinspector/ConsoleView.js
+share/webkit-1.0/webinspector/ContextMenu.js
 share/webkit-1.0/webinspector/CookieItemsView.js
 share/webkit-1.0/webinspector/DOMAgent.js
 share/webkit-1.0/webinspector/DOMStorage.js
@@ -198,10 +203,6 @@ share/webkit-1.0/webinspector/Images/timelinePillOrange.png
 share/webkit-1.0/webinspector/Images/timelinePillPurple.png
 share/webkit-1.0/webinspector/Images/timelinePillRed.png
 share/webkit-1.0/webinspector/Images/timelinePillYellow.png
-share/webkit-1.0/webinspector/Images/tipBalloon.png
-share/webkit-1.0/webinspector/Images/tipBalloonBottom.png
-share/webkit-1.0/webinspector/Images/tipIcon.png
-share/webkit-1.0/webinspector/Images/tipIconPressed.png
 share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
 share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
 share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
@@ -220,7 +221,9 @@ share/webkit-1.0/webinspector/Images/warningsErrors.png
 share/webkit-1.0/webinspector/Images/whiteConnectorPoint.png
 share/webkit-1.0/webinspector/InjectedScript.js
 share/webkit-1.0/webinspector/InjectedScriptAccess.js
-share/webkit-1.0/webinspector/InspectorControllerStub.js
+share/webkit-1.0/webinspector/InspectorBackendStub.js
+share/webkit-1.0/webinspector/InspectorFrontendHostStub.js
+share/webkit-1.0/webinspector/JavaScriptSourceSyntaxHighlighter.js
 share/webkit-1.0/webinspector/KeyboardShortcut.js
 share/webkit-1.0/webinspector/MetricsSidebarPane.js
 share/webkit-1.0/webinspector/Object.js
@@ -243,9 +246,12 @@ share/webkit-1.0/webinspector/ScopeChainSidebarPane.js
 share/webkit-1.0/webinspector/Script.js
 share/webkit-1.0/webinspector/ScriptView.js
 share/webkit-1.0/webinspector/ScriptsPanel.js
+share/webkit-1.0/webinspector/Section.js
+share/webkit-1.0/webinspector/Settings.js
 share/webkit-1.0/webinspector/SidebarPane.js
 share/webkit-1.0/webinspector/SidebarTreeElement.js
 share/webkit-1.0/webinspector/SourceFrame.js
+share/webkit-1.0/webinspector/SourceSyntaxHighlighter.js
 share/webkit-1.0/webinspector/SourceView.js
 share/webkit-1.0/webinspector/StatusBarButton.js
 share/webkit-1.0/webinspector/StoragePanel.js
@@ -260,6 +266,7 @@ share/webkit-1.0/webinspector/TimelinePanel.js
 share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js
 share/webkit-1.0/webinspector/View.js
 share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js
+share/webkit-1.0/webinspector/audits.css
 share/webkit-1.0/webinspector/inspector.css
 share/webkit-1.0/webinspector/inspector.html
 share/webkit-1.0/webinspector/inspector.js