diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/Manifest | 21 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/files/4.8.2-javascriptcore-x32.patch | 11 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild | 3 |
4 files changed, 34 insertions, 7 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 1a03b25ee056..2048a9532661 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.165 2012/07/19 21:24:26 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.166 2012/07/30 05:20:09 pesa Exp $ + + 30 Jul 2012; Davide Pesavento <pesa@gentoo.org> + +files/4.8.2-javascriptcore-x32.patch, qt-webkit-4.8.2.ebuild: + Add patch for x32 support in JavaScriptCore (bug 424049). 19 Jul 2012; Markus Meier <maekke@gentoo.org> qt-webkit-4.8.2.ebuild: arm stable, bug #424625 diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest index eb99e2719e07..546b0bab63e4 100644 --- a/x11-libs/qt-webkit/Manifest +++ b/x11-libs/qt-webkit/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2bc7ab45f5dc66f10698e8a5baefa90 SHA512 4fa7e280de9364e9eb8df651075aa0a2dded58db0db44d008bad3f053146f539c82c9aa1312006cc85b8367850ec385d3e3f716d2d4b8f4f1d15cd4756957632 WHIRLPOOL bc3241264a78353b0235a7caeb099d49a5fe93677f7fe88316a24c14b35a7f3a0c19b834b3b78a3fcd14d8b265ff5021153147a40f6332b680ad2f70095afe80 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590 AUX qt-webkit-4.8.0-c++0x-fix.patch 4886 SHA256 986d83696feb008b8bc7f410c8598b700cec330b035e793d23e73db2e31620af SHA512 cb499642de858b71351c25fb69d5c298034bbbab156adc5d804ab51305626f9616007e7af47ced67bac9a3dbd8c66350226f2e8a963a231bd5e9e032d2c85b78 WHIRLPOOL 2910bf28b85737307fcbb9eaf41c4f0def6d0356d358f1c08280b57678a225b24c7c8756442ee0ef19490c08bb19b971e151039682d0970c42f16f1861fc05bc AUX qt-webkit-4.8.1+glib-2.31.patch 1757 SHA256 769db484b945236cca8e184e12c7ed5d58940d497f2ec16594edd4138aa9a4b9 SHA512 489cbba3624e34f71004a0fcbfb9bd1c9e3fe685d50aa5281be7a29aa3845395a79fff06552a55152e5434b172680c42b80e8fe5d4244cf2600a55a2ecbf7526 WHIRLPOOL c15fddcb5c653a3436a910b969addfa4926729bbab36564fc6017772e42fe1aa0d17a90670f403fc0b80165990917196b7915b229e44c22a915f18f937f5a272 @@ -10,13 +11,23 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 EBUILD qt-webkit-4.7.4.ebuild 1322 SHA256 d7734c432e36fea6555575104216279c56709c96d689c62ac0d8cb6f5a0f995a SHA512 358bc62d857d04d08bc0463c7619b37213520ca1b09cf711db22b8fc428e4f4e180c08a412ce831ae891f0eb7bfdc335adb0cfb17cbe64580c82cbdfe3c9b201 WHIRLPOOL bc589455325aebafb89756cab2684b04b8cf4f1cd4d0a820edab93eca33280852559420c1ef179217267718524361aaf08750fbaeafe22f7aae211300b404128 EBUILD qt-webkit-4.8.1.ebuild 2076 SHA256 2ce0b69e7d8daa63471d989876ef83128191fb62196fff4f8d9b4a5fc1f09245 SHA512 6f23bc3d6f7a15b5825816d080480e0a0fee540f7232fe71f9ecb234571598273721269869efa83ff3ec31e16028d4f46c7b1a77165ebfaf7445c5a2b9efcb96 WHIRLPOOL d752e5a34be9e7bb4fd08be839cee6669846b388f1bb16fef52a2104db251767cc0a36870425c08b4cab1fcd25f61882b7ed7ec6b3734a8474ffced0a41aa948 -EBUILD qt-webkit-4.8.2.ebuild 2232 SHA256 468215cd075942faf9ef3219eb9215c766ab7bc4b1b8a3b95385c6e0783bd2ba SHA512 c150a5224ffba0098fb0abdcbee8c682419400cda9076895913d1c19f2f6e1e12990428b6d13cdd5e23ab80d5bffd4568aff9cc78acb4facc653f21e4447b1d9 WHIRLPOOL 910b8674ca718a682eaace87350bb2d02cea8fbf7d37ac6d4e536f2a73f9c1797b133b5347e1381f2921a86e4cacffff826747dcc9f623e687c81444d10f1223 -MISC ChangeLog 24159 SHA256 74534e9150fdf65a44c6cbe4a9b25e86c067d99a51625cd09eb19745baa20f3a SHA512 a32f98b986feae334f680f9bea142f0968e2a8012d8fcfbf21da50e32c98346a35491c8c4fd4a8ac9628c3c322289d6a6f70cef9b4f4723d96b93cfda5e3396c WHIRLPOOL e063c1ca211738092af71ec07705c582d80108ef8a45849b66e66b54803e0c9e0ca5170d86142b253cd7443b01190e7e707128a312f08d777085f275f218060b +EBUILD qt-webkit-4.8.2.ebuild 2277 SHA256 805590dfc4b8b299fa6117a64d3fabd8b17a898f595e93a565b57525c76f413f SHA512 09ee46684e36506002f33969f5c2497234481427474e92d734fbedb89ce4e09fd3aa5476c8bbe14a5623b58be95655f52338639c4dae52c895221b4f832759ab WHIRLPOOL 88580c1955f7b76ea9a246be63b7d024f12d3f53834f9270a1c1d278b4f84f9971d1840a70f37a477f85ac52cc7bc1556c42b69b87850b3f31323d7aca18d7ec +MISC ChangeLog 24333 SHA256 2c016a6c5980ff0e2f52a47dc41892871e53472a587edbfd0d5a2950f6e96f67 SHA512 6e5c5d1fece412cee381e515e32883fbe74386a43609aaa82c2459d81892d6e98a97bf74b922b451a43bfb7b33d2286e7fc999ea4a842d4ce0c186bc71c3d702 WHIRLPOOL 4618f65d2a62dc80015db4a0421c5651915e5b429647ac2799795f42a51a00d9ccfb9d59bc0e0b5505564d1de51cb952812574219e23e678869b569aaeb88629 MISC metadata.xml 697 SHA256 d05df9270865e0fef2c2f2ff57cd6e76e081da7201d231b471d4499eba0a3b8d SHA512 da3c6929d7aaaff373a2076d4f87a65910a01cd78ac9f89ca27c2220a48541dfca8f7268b030a6b6637bbcf8af8e013923740885a60a39b7ce064a66a921d851 WHIRLPOOL eee1d122228f97c71e70ab032f62983981fa456d86a6e8f85d7906bb6ea91451c534b5164028c0593898fdfd3525c4008f642fc9d4ec5a80e84b0baff3529dfa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlAIe8QACgkQkKaRLQcq0GJVjwCdEgA60ftfqodSEufM5UFRI4uO -hO4AoJ+oOXT5XfLOL48IxABNEkSLvTUH -=JpLp +iQIcBAEBCAAGBQJQFhmbAAoJENXLsxwXqFxyGmEQAJoSuBONo3uKcHBuGo0QZt+t +OlgCb5QdZoksT5kYWrkupxj8KKdsGcE68LsAphuCUZZcZ3LcmV2Nipj1HouVpxdp +NMoCDtyHIKom/J2EbJnEN5IDg7yJ7KrmHyRyONnK+kzIy7NsYS9DVEyRZ0xiozjf +W7QXxuhHvvBIEgrdsLplyb37pzMVDvAeBxkmGViXGPx+UXFonCYYF39nAWYP6AYD +3HimBGTbqWScFKVoKFNea+ZbdLmEEjD+WNUQVmrVuk3w8PXuLvKCAV9zdSWRta7I +dKoUYqlQgVogu54HPDCm4qo4GXT20Kf4v7t29Y113llrRFhE5h268gw1Mi6QsIGe +luHsVlq81aG/szPIJ1+nzzzTVe+nCiK10V0MD/2VfxGyRGH3nl+nXq470kPPdIuh +sjyBFOqTekeQWJRFyzKiBePCT9lDliUF2JjdYgd2YvU5opHArb+1CX0q01+k0Wyx +ddNvoAqUywVuCK0CBCK2kanc39vlaAcGqpEieLyKzcdRwtNOcCScveUOSVCItDf3 +GAAc5LD5+5NrRyIU9pbSivKj/SDbLwuebBsopu/dYP7xwMmhWy5j00olfAnYuB2z +jwvrj20ggSn97c9rPABKzwoyCaeBDaGqk25/g9PzrmLGiJEWkXWhkAWak7AnbG1W +NEwqly0SDwxgbsEkxUs5 +=u3Kl -----END PGP SIGNATURE----- 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 000000000000..16f52d9cb07e --- /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.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild index 0ba286e2a74d..7d038066a08d 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-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-webkit/qt-webkit-4.8.2.ebuild,v 1.9 2012/07/19 21:24:26 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v 1.10 2012/07/30 05:20:09 pesa Exp $ EAPI=4 @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch" "${FILESDIR}/${PN}-4.8.1+glib-2.31.patch" "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" + "${FILESDIR}/${PV}-javascriptcore-x32.patch" "${FILESDIR}/${PV}-qatomic-x32.patch" ) |