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

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

[Michael Palimaka]

commit:     0cf88384b18491e0801625db2d4f6b8fccd8357b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 14:58:23 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan  5 14:58:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0cf88384

[x11-libs/qt-script] Re-add missing patch for x32.

Package-Manager: portage-2.1.11.38

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

diff --git a/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch b/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch
new file mode 100644
index 0000000..35a1573
--- /dev/null
+++ b/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch
@@ -0,0 +1,12 @@
+diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2012-06-14 16:17:21.328043461 +0200
++++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2012-06-14 16:42:13.699386250 +0200
+@@ -884,7 +884,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
++#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1

diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 43c5fce..7fa7b63 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -20,6 +20,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" )
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/script"