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
commitf0704f9b58dfa4f318cd0491db61d3f018b5b112 (patch)
tree609c7a377cb85986ded149a08b6c1abf41cbead0 /x11-libs/qt-script
parentAdd a patch to compile on alpha wrt #318975 (diff)
downloadhistorical-f0704f9b58dfa4f318cd0491db61d3f018b5b112.tar.gz
historical-f0704f9b58dfa4f318cd0491db61d3f018b5b112.tar.bz2
historical-f0704f9b58dfa4f318cd0491db61d3f018b5b112.zip
Add a patch to compile on alpha wrt #318975
Package-Manager: portage-2.1.8.3/cvs/Linux ia64
Diffstat (limited to 'x11-libs/qt-script')
-rw-r--r--x11-libs/qt-script/ChangeLog6
-rw-r--r--x11-libs/qt-script/Manifest5
-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
4 files changed, 35 insertions, 4 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/Manifest b/x11-libs/qt-script/Manifest
index 46e6e5cf0f26..d4330f5db154 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,11 +1,12 @@
AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SHA1 ee916596e422e91179458778b013fb103dc97cac SHA256 c6c686c1cfc07caefafe697eb8b02b6806f3845f20d3fd3839301d8a94259b0b
AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb
AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
+AUX qt-script-4.6.2-alpha.patch 1233 RMD160 5ec49a6530f254f553f82a6070c6e4dbd3491b01 SHA1 54eee7a8abdaff0bfc45bed6d573f568ab5f358d SHA256 d2097e322a3819a5f32597b890423a9c53005667306e1bae39f5e5dc23687ce2
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-script-4.5.3-r1.ebuild 1171 RMD160 4f1b8e2d95faa48b509d0cb08033bd2ad8754b53 SHA1 98d06540c34c31a01d9053dfdbd18dc5aa5b3726 SHA256 c38ec5c5e9bc461ccb64346fe42d32623bca3c21c213e3e39159a15e0b95a294
EBUILD qt-script-4.6.1.ebuild 1286 RMD160 0ba19acc1929dc8dd5174622ab5567d3afd9bdc8 SHA1 2d6ea7945198b01bab742ba262f7d212af707819 SHA256 970a64ebc826611eca2e0baf2f52aa614762c66e55d34e480e72a5765646d5a8
-EBUILD qt-script-4.6.2.ebuild 1284 RMD160 018fe58ff54a09d831c00f2b311a2d35ad1460a5 SHA1 c102215ad48369b5de40f10dc66c8badcb6eba05 SHA256 16ba3443c6f6e177c8b069cb8ffe0fd3bf977230de462d7162d5c665bc82dba8
-MISC ChangeLog 8494 RMD160 b8a3da06c73c476b003441c41604cb58a0ad08d8 SHA1 f76f6fe85519ae41ca4bc6d21ff8eacdc70898d7 SHA256 23e238412d627421e16dd13cca0315da1d79eb6652e121c3ccc3764a3a8f3d36
+EBUILD qt-script-4.6.2.ebuild 1328 RMD160 af84cec402a12fe8d97d109ab8999a7f11b276fc SHA1 796bbb0ffd504b9e34da7ff4a1761ff0d16d553c SHA256 7aafa913587ee2562e1ea29007292268259ee60c70098b5869d56649503a4dee
+MISC ChangeLog 8653 RMD160 0a0e4bfbc90806d2fd4b01bc36395cd2e1950c0a SHA1 af172beacc6509fd53524c5285c28ed4c6ee9cac SHA256 338a9d5f8f9ac2c5095542b10826f445281c1eecb7140d84e6addefe8b600061
MISC metadata.xml 301 RMD160 aa2284f184a81d3eaae9c9673123973f6ed2ed0f SHA1 352e78778b7f2a3932a6c2034487a4d4d907ba0e SHA256 9b73621c335d23781d5e680a07bea4c6e427bf337e53223a6c71a1bdd4d8382c
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() {