[x11-libs/qt-webkit-4.5.3-r2] added patch that fixes arora's no-javascript crash

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 71 insertions, 1 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index dff1e523cc6e..24b155276359 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.79 2010/02/15 15:12:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.80 2010/02/17 21:20:00 wired Exp $
+
+*qt-webkit-4.5.3-r2 (17 Feb 2010)
+
+  17 Feb 2010; Alex Alexander <wired@gentoo.org> +qt-webkit-4.5.3-r2.ebuild,
+  +files/qt-webkit-4.5.3-no-javascript-crash.patch:
+  added patch that fixes arora's no-javascript crash
 
 *qt-webkit-4.6.2 (15 Feb 2010)
 
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch b/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch
new file mode 100644
index 000000000000..b5a9b01bf140
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch
@@ -0,0 +1,23 @@
+--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
++++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+@@ -317,4 +317,6 @@
+     javaScriptWindowObjectCleared() signal.
+ 
++    If Javascript is not enabled for this page, then this method does nothing.
++
+     The \a object will never be explicitly deleted by QtWebKit.
+ */
+@@ -339,8 +341,13 @@
+     javaScriptWindowObjectCleared() signal.
+ 
++    If Javascript is not enabled for this page, then this method does nothing.
++
+     The ownership of \a object is specified using \a own.
+ */
+ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object, QScriptEngine::ValueOwnership ownership)
+ {
++    if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled))
++        return;
++
+     JSC::JSLock lock(false);
+     JSDOMWindow* window = toJSDOMWindow(d->frame);
diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild
new file mode 100644
index 000000000000..d89daf1dcc67
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild,v 1.1 2010/02/17 21:20:00 wired Exp $
+
+EAPI="2"
+inherit eutils qt4-build flag-o-matic
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
+	~x11-libs/qt-dbus-${PV}[debug=]
+	~x11-libs/qt-gui-${PV}[dbus,debug=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus,debug=]
+		media-sound/phonon ) )
+	kde? ( media-sound/phonon )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/"
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	epatch "${FILESDIR}"/30_webkit_unaligned_access.diff #235685
+	epatch "${FILESDIR}"/"${P}"-no-javascript-crash.patch #295573
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	# This fixes relocation overflows on alpha
+	use alpha && append-ldflags "-Wl,--no-relax"
+	myconf="${myconf} -webkit"
+	qt4-build_src_configure
+}