Date: Sun, 28 Aug 2011 08:38:47 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160251: [PATCH] www/webkit-gtk2 to avoid Midori's crash when we add bookmark on Speed Dial page Message-ID: <201108280838.p7S8clxh070561@red.freebsd.org> Resent-Message-ID: <201108280840.p7S8eAMi032282@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160251 >Category: ports >Synopsis: [PATCH] www/webkit-gtk2 to avoid Midori's crash when we add bookmark on Speed Dial page >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 28 08:40:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE >Organization: >Environment: FreeBSD bornem.errements.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: With Midori (any version), when we want to add bookmark on speed dial page, It crashes. It's known bug: - https://bugs.launchpad.net/midori/+bug/736427 - https://bugzilla.redhat.com/show_bug.cgi?id=657683 Upstream (WebKit folk) made a patch, https://bugs.webkit.org/show_bug.cgi?id=50173 to fix this issue. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/www/webkit-gtk2/Makefile webkit-gtk2/Makefile --- /usr/ports/www/webkit-gtk2/Makefile 2011-08-23 20:32:20.000000000 +0200 +++ webkit-gtk2/Makefile 2011-08-28 10:18:13.000000000 +0200 @@ -8,7 +8,7 @@ PORTNAME= webkit PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 @@ -40,10 +40,8 @@ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ ac_cv_path_DOLT_BASH="" -CONFIGURE_ARGS= --enable-icon-database \ +CONFIGURE_ARGS= --enable-directory-upload \ --with-gtk=2.0 \ - --enable-svg \ - --enable-svg-fonts \ --enable-introspection MAKEFILE= GNUmakefile GLIB_SCHEMAS= org.webkitgtk-1.0.gschema.xml diff -urN /usr/ports/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp --- /usr/ports/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp 1970-01-01 01:00:00.000000000 +0100 +++ webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp 2011-08-28 10:18:42.000000000 +0200 @@ -0,0 +1,20 @@ +--- 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) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108280838.p7S8clxh070561>