diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-10-15 02:21:53 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-10-15 02:21:53 +0800 |
| commit | 96379675fbb72096d2e5c927631802de8ba3e25a (patch) | |
| tree | 226d50108c52020b04b2b3386aa0e3efd75e5e36 | |
| parent | d2f34137e7f429c3b6980b62a262d2f781df8f25 (diff) | |
| download | marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.tar marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.tar.gz marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.tar.bz2 marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.tar.lz marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.tar.xz marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.tar.zst marcuscom-ports-96379675fbb72096d2e5c927631802de8ba3e25a.zip | |
Fix crash in midori, and fix the build with clang.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16409 df743ca5-7f9a-e211-a948-0013205c9059
5 files changed, 62 insertions, 2 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 448517013..123acb57a 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD: ports/www/webkit-gtk2/Makefile,v 1.43 2011/09/23 22:26:07 amdmi3 Exp $ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.80 2011/07/11 10:14:46 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.82 2011/10/04 16:24:37 kwm Exp $ # PORTNAME= webkit PORTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp b/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp new file mode 100644 index 000000000..424dcc034 --- /dev/null +++ b/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp @@ -0,0 +1,18 @@ +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2011-08-29 22:19:17.000000000 +0200 ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-10-14 13:45:50.000000000 +0200 +@@ -68,6 +68,7 @@ + #endif + #include <gtk/gtk.h> + ++#define String XtStringType + #if defined(XP_UNIX) + #include "RefPtrCairo.h" + #include "gtk2xtbin.h" +@@ -80,6 +81,7 @@ + #include "PluginMessageThrottlerWin.h" + #include <gdk/gdkwin32.h> + #endif ++#undef String + + using JSC::ExecState; + using JSC::Interpreter; diff --git a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp b/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp new file mode 100644 index 000000000..958014e4e --- /dev/null +++ b/www/webkit-gtk2/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) diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index cb3de4eb3..fb3e2f561 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk3/Makefile,v 1.21 2011/09/17 15:06:15 kwm Exp $ +# $MCom: ports/www/webkit-gtk3/Makefile,v 1.22 2011/10/04 15:20:36 kwm Exp $ # PORTNAME= webkit PORTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk3 diff --git a/www/webkit-gtk3/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp b/www/webkit-gtk3/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp new file mode 100644 index 000000000..424dcc034 --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp @@ -0,0 +1,18 @@ +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2011-08-29 22:19:17.000000000 +0200 ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-10-14 13:45:50.000000000 +0200 +@@ -68,6 +68,7 @@ + #endif + #include <gtk/gtk.h> + ++#define String XtStringType + #if defined(XP_UNIX) + #include "RefPtrCairo.h" + #include "gtk2xtbin.h" +@@ -80,6 +81,7 @@ + #include "PluginMessageThrottlerWin.h" + #include <gdk/gdkwin32.h> + #endif ++#undef String + + using JSC::ExecState; + using JSC::Interpreter; |