diff options
Diffstat (limited to 'x11-libs/qt-webkit')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/Manifest | 18 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch | 23 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild | 41 |
4 files changed, 74 insertions, 16 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/Manifest b/x11-libs/qt-webkit/Manifest index efaf32f9628b..f2eb650a3f33 100644 --- a/x11-libs/qt-webkit/Manifest +++ b/x11-libs/qt-webkit/Manifest @@ -1,25 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX 30_webkit_unaligned_access.diff 4390 RMD160 2fbf2c94d140c180b33a8cf938a1add5d922e63f SHA1 4cb4fcb90d929a2e4a7484bc50a6bc7b3852a812 SHA256 2661c5c5b1811d085c5da39a6b8b107e6d0d053f24869bf8c2431b5a7fe9e0e6 +AUX qt-webkit-4.5.3-no-javascript-crash.patch 845 RMD160 2026a6990409b331d6ab495c7d9bacde26f40c8d SHA1 bd5776b379d0abc486efef1e23cbd5dbfb841f03 SHA256 b48fb83915a3f75ad9cedacc06accb6e0832d21cb0762bbd3494a21be85f581b AUX qt-webkit-4.6.0-solaris-strnstr.patch 820 RMD160 7303234fc296e5af2aa3a5e10b501776de3383b8 SHA1 e43d209055e7de4fc295a0334ac51054cd19983f SHA256 7ecb2f6317c0da2b0e986678f76f0908b0001e9fab694d5e16df922af75ec82c DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6 EBUILD qt-webkit-4.5.3-r1.ebuild 1198 RMD160 d813f3dfcca35aa1a1d631b59d8c3917fb273a94 SHA1 41495ef0dd3f3a21d7ffcfdf84075aa36d2fc00c SHA256 423eb875cb723bff43bfb0466fb4044c1c489ad9bf39949e5868dd6437b5676f +EBUILD qt-webkit-4.5.3-r2.ebuild 1262 RMD160 6db2a597f89a4ac9fe3a7cd6ba562babd3c3ad2d SHA1 764dd726c46c670e5610f98c8889823df885daf3 SHA256 1dda47b7789640ff2a160ca327875b6dd6531d013e64d666ce09c1ff30778ff7 EBUILD qt-webkit-4.5.3.ebuild 1119 RMD160 9336c62e21710ef858974b33625358ec0ae367fe SHA1 1700657ca5e4e1a53d0fd0c36abb2708a433d6a5 SHA256 138038e54bdf1ca0c75a3573f5a132088ae2739402e8a06f8bca07127d338fe4 EBUILD qt-webkit-4.6.1.ebuild 1255 RMD160 298c759a15a13a9ebffe03278d5ed684bd2e7699 SHA1 561b8cfcd31ac5cf433dcfbb8fb659d1841ab641 SHA256 3159b0b4a7c3f8e7b184e8ea22ee9cb1e9f3512f09d78c19f248058bdabc73dd EBUILD qt-webkit-4.6.2.ebuild 1255 RMD160 5fa03563489e928bdddd223beb3ade67bc14df09 SHA1 6cde28a2d38f6b87f9a6b4d8246b4072ec1386e1 SHA256 ab647cf6a234b9c8225febd88adf82cddfb59ce06258faab45a889411e18cf51 -MISC ChangeLog 10990 RMD160 e342931ca71a55b35f6a3e9373c25dac61d2a0e2 SHA1 13a833e3cefc46518a6964dab93749caa1585a16 SHA256 91194505b27c28ffe1c18933c1a6313b17fbf91e7d8b19c72eb4e8be2ee10b46 +MISC ChangeLog 11208 RMD160 ea7d4eba283ddfdb41948a8716dfe56408d3bacc SHA1 1534916f11c658fadda2546b3d622837d378f98b SHA256 a3df73c94e56c5af99117ee88eaa7efbc3d8876e16afeddb4a5c4e85587565c3 MISC metadata.xml 284 RMD160 b9074d3491bcd710578c8eea5d49322e37cbeee9 SHA1 43a9766ca508301d94a0a11151d1e7114d5f2e9a SHA256 d93c9eadc729c0d1cee418ee259ed1fac10fc8d908a3508d67a73bd9f1de900a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQEcBAEBCgAGBQJLeWRtAAoJEAWF714uGAc63xkH/3eCI9JVCXPfLkivSD8jS6bq -vf9R5DuyiElPQXawx/PbCb0FmQaypejEPVbySXptweQhWxyEIFcyEWwuQnaGAmeE -bzLo7pdGiFTKNmAM/10L7wlpEvXrxjwMk7aCdF4jWejajm6e+ac7eCLAQmTkl8FC -xz4RPtp6DYQ3TZ5tpyFGuucBPh6S1mszNaPyKN0DA0ftEo5OwisW3qnm6FZjd0Be -yT6NREZwxq8XOMTgCPQLXh0HsZqLdZLmc++3bbjOX0p5ATkEMcSOPV10PzTz3nnJ -CZeqNUyPJXhKYCqOeM616YvwCij36W4sl0nYv715hEt5Beh+X0uKJkgYF0RSihg= -=fgnT ------END PGP SIGNATURE----- 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 +} |