Update to 1.1.15.1.

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

3 files changed, 5 insertions, 80 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 7b5127375..138d526e9 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.36 2009/09/08 18:33:11 kwm Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.37 2009/09/22 18:11:57 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.1.15
+PORTVERSION=	1.1.15.1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 1fc88c507..620f16db1 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.1.15.tar.gz) = 5478d48e6b134b3e09a3d9b17f3907e8
-SHA256 (webkit-1.1.15.tar.gz) = 468f39369c5491d61d17570c35a9ddd6493de48a4d8dfe02263752656fbe1e17
-SIZE (webkit-1.1.15.tar.gz) = 6024631
+MD5 (webkit-1.1.15.1.tar.gz) = e6eb43bb4f75b4a2a09aec95e2f43e91
+SHA256 (webkit-1.1.15.1.tar.gz) = 504110cf20c74750bd4250014ef24770159f7964757827cb73eaca706fcd9c56
+SIZE (webkit-1.1.15.1.tar.gz) = 6059243
diff --git a/www/webkit-gtk2/files/patch-bugfix-1.1.15 b/www/webkit-gtk2/files/patch-bugfix-1.1.15
deleted file mode 100644
index d3415e563..000000000
--- a/www/webkit-gtk2/files/patch-bugfix-1.1.15
+++ /dev/null
@@ -1,75 +0,0 @@
---- ./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