[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/files/, x11-libs/qt-webkit/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     aca550f76ba6bd0334d4006ac955a26ef6119a94
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Sep 11 00:44:57 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 00:44:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=aca550f7

[x11-libs/qt-webkit:4] Add missing patch from portage.

Remaining patches are either applied upstream or no longer relevant.

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 .../qt-webkit/files/4.8.2-javascriptcore-x32.patch |   11 +++++++++++
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild       |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-webkit/files/4.8.2-javascriptcore-x32.patch b/x11-libs/qt-webkit/files/4.8.2-javascriptcore-x32.patch
new file mode 100644
index 0000000..16f52d9
--- /dev/null
+++ b/x11-libs/qt-webkit/files/4.8.2-javascriptcore-x32.patch
@@ -0,0 +1,11 @@
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig	2012-07-17 15:06:26.692276108 +0000
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h	2012-07-17 15:06:54.480928701 +0000
+@@ -993,7 +993,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
++#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \
+     || (CPU(IA64) && !CPU(IA64_32)) \
+     || CPU(ALPHA) \
+     || CPU(SPARC64) \

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 0f071b3..50d54f1 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
+	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
 )
 
 pkg_setup() {