summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-06-26 21:18:48 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-06-26 21:18:48 +0000
commit8026fde8bbb9b31016519770c6732c006b4fd468 (patch)
treefa3458bb78dedc50250ed15d4d9243eda14e1962 /x11-libs
parentMask USE=jit for qt-script wrt bug 423141. (diff)
downloadhistorical-8026fde8bbb9b31016519770c6732c006b4fd468.tar.gz
historical-8026fde8bbb9b31016519770c6732c006b4fd468.tar.bz2
historical-8026fde8bbb9b31016519770c6732c006b4fd468.zip
Apply another patch for x32 support in JavaScriptCore (bug 421009).
Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-script/ChangeLog7
-rw-r--r--x11-libs/qt-script/Manifest25
-rw-r--r--x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch12
-rw-r--r--x11-libs/qt-script/qt-script-4.8.2.ebuild3
4 files changed, 37 insertions, 10 deletions
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index b1625de4546e..9decdb4c826c 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.120 2012/06/25 16:04:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.121 2012/06/26 21:18:48 pesa Exp $
+
+ 26 Jun 2012; Davide Pesavento <pesa@gentoo.org>
+ +files/4.8.2-javascriptcore-x32.patch, qt-script-4.8.2.ebuild:
+ Apply another patch for x32 support in JavaScriptCore (bug 421009).
25 Jun 2012; Raúl Porcel <armin76@gentoo.org> qt-script-4.8.1.ebuild,
qt-script-4.8.2.ebuild:
@@ -471,4 +475,3 @@
21 Dec 2007; Caleb Tennis <caleb@gentoo.org> +metadata.xml,
+qt-script-4.4.0_rc1.ebuild:
Initial ebuild
-
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index cd6d44b2078c..6a380c8bbf60 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
+AUX 4.8.2-javascriptcore-x32.patch 1011 RMD160 96e160f0311424ba6413efd2be3b404af75c0e6d SHA1 68d958bd39817c2d2ac2e5135bd932422d7fa944 SHA256 7a20c0e70285f9506b2d1316ff7d034943e5a6885ed50c5364f276bc8e648d36
AUX 4.8.2-qatomic-x32.patch 1962 RMD160 3da3b0a2fea1ab5555e71cdfa93f5b4eb198ed5f SHA1 0451b2c78e39622b9626527bda55c1aa54283a30 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da
AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
AUX qt-script-4.8.1+gcc-4.7.patch 2255 RMD160 fe45b8b73c59b22418b5e3916f99098492694e51 SHA1 a44d0503f54a5339d5d2113f020965d795076bf0 SHA256 57106ea4fc4df1a4ae7d06738faeae659fcbcc6d6d602a856a24f3ddcca7f0c2
@@ -11,13 +12,23 @@ DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 RMD160 6a15077aee1e8407
EBUILD qt-script-4.6.3.ebuild 1279 RMD160 2fc7798cc7babf6d758fc38d7628b32ca9e21b61 SHA1 af1cb0781ed6fd13e6c785fc5ddff614851af2f0 SHA256 8b9faac082c4605ff12b46c01baa7de67554c6ae0257373ab28eeca67475cc68
EBUILD qt-script-4.7.4.ebuild 1525 RMD160 aac60acf4cad5488a1bf6e0eac5df8c62627c40b SHA1 ae63f9d6f3c78138d26d4e15f8f4e84205e442eb SHA256 115543c2908dd34fdd78d2246b7e69690021c0188c883b5612786940fbf8672f
EBUILD qt-script-4.8.1.ebuild 1595 RMD160 c15e43b18b86e58a1faff1bd9c365893683bc703 SHA1 7db4d4f438ed62e40761e13b4cada5e478bebe2d SHA256 a6236c8982a0515d45d5d636a1e511fc89cd583c82ed479f701452aaed197f08
-EBUILD qt-script-4.8.2.ebuild 1669 RMD160 851ca2be3bb0c6540fe7a0191046e387e0cfdf41 SHA1 e252ecccf3555b12c14e3ca0c33c57612cdace8d SHA256 a78cddb420c15e28c45a622c847be1c06d1d1b1632f0b039d8475f648554fa33
-MISC ChangeLog 14970 RMD160 3fdf198691e7600ee02bcef2c17adbe35ca205e2 SHA1 f2006c7116a3ecff9b59ebb974cf2ab810e4b58e SHA256 1ed32d8c56711800033941828a148bd1559c8efc7c4b2fdf573e8bdc9580a1d3
+EBUILD qt-script-4.8.2.ebuild 1712 RMD160 8032029b3c2db4cd284fa5a77253c9eadc9b8aa1 SHA1 8bea66e34cdafbd2854263db87dc08962c322c07 SHA256 7a7c3655a54dc7cfed150f345efbe83969df81758e71689e0a9981b04433d696
+MISC ChangeLog 15152 RMD160 ed7b4d97b75eb78f5f6688a521828af1de342f76 SHA1 ff34c47c2bbda064cb641989089aa998b8ab0a8a SHA256 ef2e31f5e4592ec37225ae19a622aaf35390fa26a3c7664a57bf80af3511a182
MISC metadata.xml 671 RMD160 82017a8c2c972ab185d254d66a570a35d4467d70 SHA1 10e115fd3b516093f2f1e44b76970156abe3a934 SHA256 d2ab44d3d87cd5c33d716634746a780afb4b647d3c6277282d744f2086e0651b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/ojC8ACgkQuQc30/atMkAayACeLnyPENdCvFihPUxj6yhOLDeq
-IpIAn2yf+l66vnX+m/kbmKb+V7DcjLRM
-=OLrP
+iQIcBAEBCgAGBQJP6ideAAoJENXLsxwXqFxyORwQAKiThPjXw3x2mdcXzKzNquCC
+zdmaLmaKbzqCVG5oagtNgpnciEE5aYHxZFinQixY4t7v9RqVrkIV6L0opfwtCk6O
+omGbpYXyYeXpTJBQCLcd+uLb65bgMb7i5l60p6wcEhAHe0tbmq9OG1DTPSTaagCU
+TKRtDamdc0rDBWTQd4xqiREjTSfwnrF2i8B5nFdJoCZ15tRdo90Kjk0NTNJinJ8N
+vk4vmV27efNNbDHRdHP0WTjRs06qIdC1SK7EkB9lUaa1u0L9qvd8NQcqyQ6S9TRI
+SamSS2AvX89w22QD4+15AWfnqEGSOn2mMsH76rUCs6YQSynUuM1FOBg/u9a5N9ub
+tFQgl5TzhfpGgtJWg/yaWAhJMugjbnsoTAoUQB3WRM2uZ0H0UbLqsNKhhGRL6dHq
+wZTBOCdmYPyplXchfL0he2bmn1FNCjqukPsT8/u8Y5LBg3CcBX66HlKFSh51zg3o
+hS3W5XPKdIRLaBfc3z6QEQFsNLUIxO+0jAsXTaHM1vetTFwMvZeBn5XSH37Ye2bo
+Xc8GN8TE5zhuMj858hbTo/8bAwjS0L+o/KwNYaZIj1PJA5E9eCTsbzL6so1Kl/2p
+Sa8iD5u+5bz6ehdWq1PDP0DbfriqcHbOzz6IQN6UB3KG5pM/wzv8UB2BSmowUtOQ
+3VGeZuAM7UH6IBxp6ba+
+=ZgAk
-----END PGP SIGNATURE-----
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 000000000000..35a157337cf9
--- /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.2.ebuild b/x11-libs/qt-script/qt-script-4.8.2.ebuild
index 2f07ab17970e..16ed9c754faa 100644
--- a/x11-libs/qt-script/qt-script-4.8.2.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.8.2.ebuild,v 1.3 2012/06/25 16:04:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.2.ebuild,v 1.4 2012/06/26 21:18:48 pesa Exp $
EAPI=4
@@ -21,6 +21,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
+ "${FILESDIR}/${PV}-javascriptcore-x32.patch"
"${FILESDIR}/${PV}-qatomic-x32.patch"
)