summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2010-05-22 09:31:49 +0000
committerRaúl Porcel <armin76@gentoo.org>2010-05-22 09:31:49 +0000
commit62d5681fef9da65059244fa1ad27f1c7cc78fdbe (patch)
treead10f76e3359d3fc5853ba0c898f4d63db2b9531 /x11-libs
parentAdd a patch to compile on alpha wrt #318975 (diff)
downloadgentoo-2-62d5681fef9da65059244fa1ad27f1c7cc78fdbe.tar.gz
gentoo-2-62d5681fef9da65059244fa1ad27f1c7cc78fdbe.tar.bz2
gentoo-2-62d5681fef9da65059244fa1ad27f1c7cc78fdbe.zip
Add a patch to compile on alpha wrt #318975
(Portage version: 2.1.8.3/cvs/Linux ia64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-script/ChangeLog6
-rw-r--r--x11-libs/qt-script/files/qt-script-4.6.2-alpha.patch25
-rw-r--r--x11-libs/qt-script/qt-script-4.6.2.ebuild3
3 files changed, 32 insertions, 2 deletions
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index b9ef5dc5c8df..8e9bd7928774 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-script
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.66 2010/04/18 13:02:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.67 2010/05/22 09:31:49 armin76 Exp $
+
+ 22 May 2010; Raúl Porcel <armin76@gentoo.org> qt-script-4.6.2.ebuild,
+ +files/qt-script-4.6.2-alpha.patch:
+ Add a patch to compile on alpha wrt #318975
18 Apr 2010; <nixnut@gentoo.org> qt-script-4.6.2.ebuild:
ppc stable #297299
diff --git a/x11-libs/qt-script/files/qt-script-4.6.2-alpha.patch b/x11-libs/qt-script/files/qt-script-4.6.2-alpha.patch
new file mode 100644
index 000000000000..8687c26f0c23
--- /dev/null
+++ b/x11-libs/qt-script/files/qt-script-4.6.2-alpha.patch
@@ -0,0 +1,25 @@
+diff -ur qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-04-27 18:14:28.000000000 +0200
++++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-04-27 19:33:10.000000000 +0200
+@@ -367,6 +367,12 @@
+ #endif
+ #endif
+
++/* PLATFORM(alpha) */
++#if defined(__alpha__)
++#define WTF_PLATFORM_ALPHA 1
++#endif
++
++
+ /* PLATFORM(WINCE) && PLATFORM(QT)
+ We can not determine the endianess at compile time. For
+ Qt for Windows CE the endianess is specified in the
+@@ -720,7 +726,7 @@
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+ #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX))
+ #define WTF_USE_JSVALUE64 1
+-#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64)
++#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA)
+ #define WTF_USE_JSVALUE64 1
+ #elif PLATFORM(AIX64)
+ #define WTF_USE_JSVALUE64 1 \ No newline at end of file
diff --git a/x11-libs/qt-script/qt-script-4.6.2.ebuild b/x11-libs/qt-script/qt-script-4.6.2.ebuild
index 7732f826e43d..10dbc98a448f 100644
--- a/x11-libs/qt-script/qt-script-4.6.2.ebuild
+++ b/x11-libs/qt-script/qt-script-4.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.2.ebuild,v 1.4 2010/04/18 13:02:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.2.ebuild,v 1.5 2010/05/22 09:31:49 armin76 Exp $
EAPI="2"
inherit qt4-build
@@ -24,6 +24,7 @@ src/3rdparty/javascriptcore/
PATCHES=(
"${FILESDIR}/qt-4.6-nolibx11.patch"
+ "${FILESDIR}/qt-script-4.6.2-alpha.patch"
)
src_configure() {