Update to 1.1.15.

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

5 files changed, 95 insertions, 13 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 442d73ed6..7b5127375 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.35 2009/08/25 00:01:15 marcus Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.36 2009/09/08 18:33:11 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.1.14
+PORTVERSION=	1.1.15
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
@@ -27,7 +27,8 @@ MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt
 USE_BISON=	build
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libxslt
+USE_AUTOTOOLS=	libtool:22
+USE_GNOME=	gtk20 libxslt ltverhack:13
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -64,7 +65,9 @@ CONFIGURE_ARGS+=--disable-debug
 CONFIGURE_ARGS+=--enable-static
 PLIST_SUB+=	STATIC=""
 .else
-PLIST_SUB+=	STATIC="@comment "
+CONFIGURE_ARGS+=--enable-static=no
+#PLIST_SUB+=	STATIC="@comment "
+PLIST_SUB+=	STATIC=""
 .endif
 
 post-patch:
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 75cd512ba..1fc88c507 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.1.14.tar.gz) = bff87d1ddc562223cb99201950d7e138
-SHA256 (webkit-1.1.14.tar.gz) = 46a02c7a706e7245440f4ad3ce8edec4eb83725f43d77c5b38039cc0b2d227b1
-SIZE (webkit-1.1.14.tar.gz) = 5925013
+MD5 (webkit-1.1.15.tar.gz) = 5478d48e6b134b3e09a3d9b17f3907e8
+SHA256 (webkit-1.1.15.tar.gz) = 468f39369c5491d61d17570c35a9ddd6493de48a4d8dfe02263752656fbe1e17
+SIZE (webkit-1.1.15.tar.gz) = 6024631
diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
index c95df4ca2..1b4d9eec1 100644
--- a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
+++ b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
@@ -1,11 +1,11 @@
---- JavaScriptCore/wtf/Platform.h.orig	2009-08-28 13:44:10.000000000 -0400
-+++ JavaScriptCore/wtf/Platform.h	2009-08-28 13:46:18.000000000 -0400
-@@ -601,7 +601,7 @@
+--- JavaScriptCore/wtf/Platform.h.orig	2009-09-20 01:06:03.000000000 +0200
++++ JavaScriptCore/wtf/Platform.h	2009-09-21 22:01:16.000000000 +0200
+@@ -626,7 +626,7 @@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if PLATFORM(X86_64) && (PLATFORM(MAC) || PLATFORM(LINUX))
-+#if PLATFORM(X86_64) && (PLATFORM(MAC) || PLATFORM(LINUX) || PLATFORM(FREEBSD))
+-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
++#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD))
  #define WTF_USE_JSVALUE64 1
  #elif PLATFORM(ARM) || PLATFORM(PPC64)
  #define WTF_USE_JSVALUE32 1
diff --git a/www/webkit-gtk2/files/patch-bugfix-1.1.15 b/www/webkit-gtk2/files/patch-bugfix-1.1.15
new file mode 100644
index 000000000..d3415e563
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-bugfix-1.1.15
@@ -0,0 +1,75 @@
+--- ./JavaScriptCore/interpreter/Interpreter.cpp.orig	2009-09-21 13:39:42.000000000 +0200
++++ ./JavaScriptCore/interpreter/Interpreter.cpp	2009-09-22 13:04:01.000000000 +0200
+@@ -988,6 +988,10 @@ NEVER_INLINE void Interpreter::tryCacheP
+ 
+     // Structure transition, cache transition info
+     if (slot.type() == PutPropertySlot::NewProperty) {
++        if (structure->isDictionary()) {
++            vPC[0] = getOpcode(op_put_by_id_generic);
++            return;
++        }
+         vPC[0] = getOpcode(op_put_by_id_transition);
+         vPC[4] = structure->previousID();
+         vPC[5] = structure;
+--- ./JavaScriptCore/jit/JITStubs.cpp.orig	2009-09-21 13:39:42.000000000 +0200
++++ ./JavaScriptCore/jit/JITStubs.cpp	2009-09-22 13:04:02.000000000 +0200
+@@ -695,7 +695,7 @@ NEVER_INLINE void JITThunks::tryCachePut
+     // Structure transition, cache transition info
+     if (slot.type() == PutPropertySlot::NewProperty) {
+         StructureChain* prototypeChain = structure->prototypeChain(callFrame);
+-        if (!prototypeChain->isCacheable()) {
++        if (!prototypeChain->isCacheable() || structure->isDictionary()) {
+             ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(cti_op_put_by_id_generic));
+             return;
+         }
+--- ./LayoutTests/fast/js/resources/transition-cache-dictionary-crash.js.orig	2009-09-22 13:04:06.000000000 +0200
++++ ./LayoutTests/fast/js/resources/transition-cache-dictionary-crash.js	2009-09-22 13:04:06.000000000 +0200
+@@ -0,0 +1,19 @@
++description("Test to ensure we don't attempt to cache new property transitions on dictionary.  Passes if you don't crash.");
++
++var cacheableDictionary = {};
++for (var i = 0; i < 500; i++)
++    cacheableDictionary["a" + i] = i;
++
++function f(o) {
++    o.crash = "doom!";
++}
++f({});
++f(cacheableDictionary);
++f(cacheableDictionary);
++f(cacheableDictionary);
++f(cacheableDictionary);
++f(cacheableDictionary);
++f(cacheableDictionary);
++f(cacheableDictionary);
++f(cacheableDictionary);
++successfullyParsed = true;
+--- ./LayoutTests/fast/js/transition-cache-dictionary-crash-expected.txt.orig	2009-09-22 13:04:06.000000000 +0200
++++ ./LayoutTests/fast/js/transition-cache-dictionary-crash-expected.txt	2009-09-22 13:04:06.000000000 +0200
+@@ -0,0 +1,9 @@
++Test to ensure we don't attempt to cache new property transitions on dictionary. Passes if you don't crash.
++
++On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
++
++
++PASS successfullyParsed is true
++
++TEST COMPLETE
++
+--- ./LayoutTests/fast/js/transition-cache-dictionary-crash.html.orig	2009-09-22 13:04:06.000000000 +0200
++++ ./LayoutTests/fast/js/transition-cache-dictionary-crash.html	2009-09-22 13:04:06.000000000 +0200
+@@ -0,0 +1,13 @@
++<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
++<html>
++<head>
++<link rel="stylesheet" href="resources/js-test-style.css">
++<script src="resources/js-test-pre.js"></script>
++</head>
++<body>
++<p id="description"></p>
++<div id="console"></div>
++<script src="resources/transition-cache-dictionary-crash.js"></script>
++<script src="resources/js-test-post.js"></script>
++</body>
++</html>
+\ No newline at end of file
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 1699cf415..dc1782058 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -14,6 +14,7 @@ include/webkit-1.0/webkit/webkitdefines.h
 include/webkit-1.0/webkit/webkitdownload.h
 include/webkit-1.0/webkit/webkitenumtypes.h
 include/webkit-1.0/webkit/webkiterror.h
+include/webkit-1.0/webkit/webkithittestresult.h
 include/webkit-1.0/webkit/webkitnetworkrequest.h
 include/webkit-1.0/webkit/webkitnetworkresponse.h
 include/webkit-1.0/webkit/webkitsecurityorigin.h
@@ -34,7 +35,7 @@ include/webkit-1.0/webkit/webkitwebwindowfeatures.h
 %%STATIC%%lib/libwebkit-1.0.a
 lib/libwebkit-1.0.la
 lib/libwebkit-1.0.so
-lib/libwebkit-1.0.so.12
+lib/libwebkit-1.0.so.13
 libdata/pkgconfig/webkit-1.0.pc
 share/locale/de/LC_MESSAGES/webkit.mo
 share/locale/en_GB/LC_MESSAGES/webkit.mo
@@ -208,6 +209,7 @@ share/webkit-1.0/webinspector/ObjectProxy.js
 share/webkit-1.0/webinspector/Panel.js
 share/webkit-1.0/webinspector/PanelEnablerView.js
 share/webkit-1.0/webinspector/Placard.js
+share/webkit-1.0/webinspector/Popup.js
 share/webkit-1.0/webinspector/ProfileDataGridTree.js
 share/webkit-1.0/webinspector/ProfileView.js
 share/webkit-1.0/webinspector/ProfilesPanel.js
@@ -230,8 +232,10 @@ share/webkit-1.0/webinspector/StoragePanel.js
 share/webkit-1.0/webinspector/StylesSidebarPane.js
 share/webkit-1.0/webinspector/SummaryBar.js
 share/webkit-1.0/webinspector/TextPrompt.js
+share/webkit-1.0/webinspector/TimelineAgent.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/inspector.css
 share/webkit-1.0/webinspector/inspector.html
 share/webkit-1.0/webinspector/inspector.js