summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-09-15 04:41:56 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-09-15 04:41:56 +0800
commitb1169514a841da53c954760e6fab76e96ca17d73 (patch)
treeca758c91232e75c636aa23c6a08e05fdb0263ebb
parente17e64027bb2ea5cff718a54b555a9290dc0a5c9 (diff)
downloadmarcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.tar
marcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.tar.gz
marcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.tar.bz2
marcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.tar.lz
marcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.tar.xz
marcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.tar.zst
marcuscom-ports-b1169514a841da53c954760e6fab76e96ca17d73.zip
Update to 1.4.3.
Add patch to fix midori crasher in dashboard. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16166 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--www/webkit-gtk3/Makefile5
-rw-r--r--www/webkit-gtk3/distinfo4
-rw-r--r--www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp22
3 files changed, 26 insertions, 5 deletions
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index e05b643f3..faef8e858 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/webkit-gtk3/Makefile,v 1.18 2011/07/01 11:20:35 kwm Exp $
+# $MCom: ports/www/webkit-gtk3/Makefile,v 1.19 2011/07/11 10:14:46 kwm Exp $
#
PORTNAME= webkit
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 1.4.3
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk3
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index 2200765d8..2f51e59f1 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.4.2.tar.gz) = dee6336b5366e952f67a18a66dca2edce95a8e70f591dbc7fc30cf30b5fdb9ba
-SIZE (webkit-1.4.2.tar.gz) = 8504310
+SHA256 (webkit-1.4.3.tar.gz) = b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
+SIZE (webkit-1.4.3.tar.gz) = 8512387
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
new file mode 100644
index 000000000..958014e4e
--- /dev/null
+++ b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp
@@ -0,0 +1,22 @@
+https://bugs.webkit.org/show_bug.cgi?id=50173
+
+--- Source/WebKit/gtk/webkit/webkitwebview.cpp.orig 2011-06-14 02:10:55.000000000 +0200
++++ Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-08-27 10:48:52.000000000 +0200
+@@ -4939,6 +4939,8 @@
+
+ priv->mainResource = adoptGRef(webResource);
+ priv->mainResourceIdentifier = identifier;
++
++ g_object_ref(webView);
+ }
+
+ void webkit_web_view_add_resource(WebKitWebView* webView, const char* identifier, WebKitWebResource* webResource)
+@@ -4955,6 +4957,8 @@
+ priv->mainResource = 0;
+ } else
+ g_hash_table_remove(priv->subResources.get(), identifier);
++
++ g_object_unref(webView);
+ }
+
+ WebKitWebResource* webkit_web_view_get_resource(WebKitWebView* webView, char* identifier)