diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-08-22 16:17:29 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-08-22 16:17:29 +0800 |
| commit | d562806d75a269b364169d7780b4eef97750bf21 (patch) | |
| tree | 0af14c72211f652a0ff4820ea7e6c61d091f8dd7 | |
| parent | 188fc3e601599631c7c7d32414450917fd0ef28e (diff) | |
| download | marcuscom-ports-d562806d75a269b364169d7780b4eef97750bf21.tar.gz marcuscom-ports-d562806d75a269b364169d7780b4eef97750bf21.tar.zst marcuscom-ports-d562806d75a269b364169d7780b4eef97750bf21.zip | |
Don't massively over grab memory [1]
Delete patch that might causing problems. [2]
Submitted by: Gustau [2]
Obtained from: OpenBSD [1]
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18655 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | www/webkit-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h | 16 | ||||
| -rw-r--r-- | www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp | 20 |
2 files changed, 16 insertions, 20 deletions
diff --git a/www/webkit-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h b/www/webkit-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h new file mode 100644 index 000000000..dffc23b4d --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h @@ -0,0 +1,16 @@ +$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.1 2013/04/13 09:11:02 landry Exp $ + +https://bugs.webkit.org/show_bug.cgi?id=61137 + +--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig 2013-06-11 09:39:47.000000000 +0200 ++++ Source/JavaScriptCore/jit/ExecutableAllocator.h 2013-08-07 09:25:56.000000000 +0200 +@@ -105,7 +105,8 @@ + #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) + #if CPU(ARM) + static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; +-#elif CPU(X86_64) ++// We don't want an initial allocation of 1GB, it's above the default ulimit ++#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024; + #else + static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; diff --git a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp deleted file mode 100644 index f7ca5e227..000000000 --- a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- Source/WebKit/gtk/webkit/webkitwebview.cpp.orig 2013-03-26 18:25:31.000000000 +0000 -+++ Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-03-31 11:49:59.000000000 +0000 -@@ -5061,6 +5061,8 @@ void webkit_web_view_add_main_resource(W - - priv->mainResource = adoptGRef(webResource); - priv->mainResourceIdentifier = identifier; -+ -+ g_object_ref(webView); - } - - void webkit_web_view_add_resource(WebKitWebView* webView, const char* identifier, WebKitWebResource* webResource) -@@ -5078,6 +5080,8 @@ void webkitWebViewRemoveSubresource(WebK - if (!mainResource.isNull() && g_str_equal(identifier, mainResource.data())) - return; - g_hash_table_remove(webView->priv->subResources.get(), identifier); -+ -+ g_object_unref(webView); - } - - WebKitWebResource* webkit_web_view_get_resource(WebKitWebView* webView, char* identifier) |