commit: e8b76976d5ad5b57bb572bc76b1a76a7c61c14e3 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> AuthorDate: Mon Mar 14 17:14:22 2016 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Mon Mar 14 17:15:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=e8b76976
firefox-45.0: moved nonejit patches into patch tarball for inclusion in gentoo repo www-client/firefox/Manifest | 2 +- ...efox-45.0-jitless-atomic-operations-ppc64.patch | 46 ---------------------- ...irefox-45.0-jitless-atomic-operations-x86.patch | 11 ------ www-client/firefox/firefox-45.0.ebuild | 6 +-- 4 files changed, 3 insertions(+), 62 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 10794b2..fb77ee1 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -55,7 +55,7 @@ DIST firefox-45.0-nl.xpi 429704 SHA256 ce63fd03a213876d4b78efbe266c36519331267c3 DIST firefox-45.0-nn-NO.xpi 427850 SHA256 29d89d3378c7124378118242c60bcde1d477930f7b502bf0ed99c9014e7456d5 SHA512 938d911292ff52c7833e5443aff1babbb1e2b252c03080ceb60aff047fac5e09f0c5b0b8fa083d2f0fd16801b91f5d0a697bd6dc7c88dad1bc9e7eeeaabba764 WHIRLPOOL f4d1635a61bf98cd36528513819dba90f05d17a09d299ac34f0fcd1feaa26e11f6aa5357431e01ebad8720ba5979db4d7fcb7aeaec466d70875286f515f0e2d0 DIST firefox-45.0-or.xpi 492735 SHA256 d8a6b4cbaeb0238888c660e0a8f47490008e7f1b2cbbf2a7ccc1ba8d60343c48 SHA512 068e8a653b94309203a88544db396e3dec0d317b30b92f0f527ac94348681456174b86139e7b955d8f4ecc7c3fdd8aad418944006dfa086a7c4d0757906a4f79 WHIRLPOOL 4e5fbbaa5f2933916575f40594080b26ccc410d6dc8c833179ba2c351aa324cd31b70fc6d0e2bc282dab71dc842b3c2fde9f46d8aee9f451ac1a3c70091f5ce4 DIST firefox-45.0-pa-IN.xpi 485887 SHA256 36b94559c34da4ca60f3798f7c57869381054164613d40113d15b1a984f7471c SHA512 9352e1ac99f537a3e0e9ff394c83a9b5586a15161824d9e2425b0544687c5b515450b4c82e4c3b1638afb773fa7895a1a5ff8fc2b6ff03c1fe9814f30f33aa19 WHIRLPOOL 5ac5cc7d78bd9f5f9b4a55489da8709d13012ef35c33832a24594640660a20c7132ea7a33a0a8f53c30f63ae0c6c5d298d8a011bde603bfee18bb248beb4eb63 -DIST firefox-45.0-patches-01.tar.xz 15080 SHA256 fff58dcde62f4da03c8b11cb6d5daea018109424fa78352a2eff483c6c325a6d SHA512 a9ebb97a55fc4566b5e4ae3f1f6a4f8e5b3b4a903780e20d22e8b26f4571d270bc86c87c728c5956b16a8303d37e2f974cd880dec8f9b3862f655808b36eecd0 WHIRLPOOL be3f915f9a0a8ce0eca06c77bb1467dac8fc19198466b81582892a17eab05c5c18858ae135db772dd67c8321e343af61eaee8418b92ed6813ebcc7295b8c7cec +DIST firefox-45.0-patches-02.tar.xz 15824 SHA256 9e6e6d999e61e47d603579d9362b09f6a29847ea79023b774ff1a2dab9f4a40c SHA512 bc30914c65ec93b97d95a9f53faaf06a7d9e834eebaa90d34297e6a1eddd8ced192acf43b18ca8e70d4617de8d3d84d161c182d67f3c3501d68fc49867e14dd8 WHIRLPOOL 9772b242f312dc3a4f0a6a77b45ddb26ad3a98ee6d96b6d46438eeab55d16d9a049e889423f4c84b404d5519823eb5afc486bb77cbe8918a3a2860663f32eb50 DIST firefox-45.0-pl.xpi 379556 SHA256 f0ab7ae2db4a14a99c0a1ecd2f94086d994db4a6da34c88c31d7c9348c9c2d2f SHA512 7b1e659d2cce64e63b17760c887dc07f6c8f1f914e36885f2cec271ddd4c6a7e3ec92f4b6679fcce58513aec1fcc8da01bcd5b5f92e224a84cdf29d94ea20cb0 WHIRLPOOL efa92012332c42ab81d9c468cfbe27824ddb3ffc8af52bd0e1a2f009794e46d855c3bce0e84bd1a69e0d1e32850806e901ecf48db084331ef64ad6233e8d4a6a DIST firefox-45.0-pt-BR.xpi 445519 SHA256 d6a00cd285f091eed478a2f558e78970ef12f80865297baf35acc1e903beb074 SHA512 f794f2b7277c44f0691c569e1bb36de3e1188e16241bb02aa1c5b5c1a30736c75ed1f8b9801fc72b10a8d34d2fe7c03b2e2877bb5813cd8c6baa33078ec88aed WHIRLPOOL ae03530367fe4188537166209b6446831828dff4df7ad33abe9fc7b19facbfda45a66cc6e14e5edb6b34cb3a7959221ac84d82061547b3168bb16c143071cb91 DIST firefox-45.0-pt-PT.xpi 431497 SHA256 faf804a408fe1e9bc1285ce1cfbd111be6b249860ad30b0b9c4e17a74a1eeaad SHA512 5e39b9b16acbd3f7c734e92bb2c0b6b6d9a8daa78d476f64250a493bf4ad8e0eb539549b246558d475455b6de83f5760da6773e0aabcabd8003587ad40b31f9e WHIRLPOOL 1cd96378a21cff2a1a88cfc05ddc27d9504916c32b173e6ba51d8c3d57da62aaa9bd747e29f8c746dae76e81bec8da71d2af80f494625ee36fa2170984b028c7 diff --git a/www-client/firefox/files/firefox-45.0-jitless-atomic-operations-ppc64.patch b/www-client/firefox/files/firefox-45.0-jitless-atomic-operations-ppc64.patch deleted file mode 100644 index 26e9373..0000000 --- a/www-client/firefox/files/firefox-45.0-jitless-atomic-operations-ppc64.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# HG changeset patch -# User Lars T Hansen <[email protected]> -# Date 1457091735 -3600 -# Node ID 69f237c2cf9131e97372debee01931dbacd064e5 -# Parent 3aa4483740828617001060fe7386051020521e90 -Bug 1253216 - clean up the atomic ops ifdef nest. r=jorendorff - -diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h ---- a/js/src/jit/AtomicOperations.h -+++ b/js/src/jit/AtomicOperations.h -@@ -318,21 +318,29 @@ AtomicOperations::isLockfree(int32_t siz - } // namespace js - - #if defined(JS_CODEGEN_ARM) - # include "jit/arm/AtomicOperations-arm.h" - #elif defined(JS_CODEGEN_ARM64) - # include "jit/arm64/AtomicOperations-arm64.h" - #elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64) - # include "jit/mips-shared/AtomicOperations-mips-shared.h" --#elif defined(__ppc64__) || defined(__PPC64_) \ -- || defined(__ppc64le__) || defined(__PPC64LE__) \ -- || defined(__ppc__) || defined(__PPC__) -+#elif defined(__ppc__) || defined(__PPC__) - # include "jit/none/AtomicOperations-ppc.h" - #elif defined(JS_CODEGEN_NONE) --# include "jit/none/AtomicOperations-none.h" -+ // You can disable the JIT with --disable-ion but you must still -+ // provide the atomic operations that will be used by the JS engine. -+ // When the JIT is disabled the operations are simply safe-for-races -+ // C++ realizations of atomics. These operations cannot be written -+ // in portable C++, hence the default here is to crash. See the -+ // top of the file for more guidance. -+# if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__) -+# include "jit/none/AtomicOperations-ppc.h" -+# else -+# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always -+# endif - #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) - # include "jit/x86-shared/AtomicOperations-x86-shared.h" - #else - # error "Atomic operations must be defined for this platform" - #endif - - #endif // jit_AtomicOperations_h - diff --git a/www-client/firefox/files/firefox-45.0-jitless-atomic-operations-x86.patch b/www-client/firefox/files/firefox-45.0-jitless-atomic-operations-x86.patch deleted file mode 100644 index 86b2713..0000000 --- a/www-client/firefox/files/firefox-45.0-jitless-atomic-operations-x86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/js/src/jit/AtomicOperations.h 2016-03-12 13:42:27.914524205 -0500 -+++ b/js/src/jit/AtomicOperations.h 2016-03-12 13:42:15.644573630 -0500 -@@ -311,6 +311,8 @@ - // top of the file for more guidance. - # if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__) - # include "jit/none/AtomicOperations-ppc.h" -+# elif defined(__i386__) || defined(__x86_64__) -+# include "jit/x86-shared/AtomicOperations-x86-shared.h" - # else - # include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always - # endif diff --git a/www-client/firefox/firefox-45.0.ebuild b/www-client/firefox/firefox-45.0.ebuild index 8fa5df6..e93d2b4 100644 --- a/www-client/firefox/firefox-45.0.ebuild +++ b/www-client/firefox/firefox-45.0.ebuild @@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then fi # Patch version -PATCH="${PN}-45.0-patches-01" +PATCH="${PN}-45.0-patches-02" MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"; MOZCONFIG_OPTIONAL_GTK3="enabled" @@ -132,9 +132,7 @@ src_unpack() { src_prepare() { # Apply our patches eapply "${WORKDIR}/firefox" \ - "${FILESDIR}"/${PN}-45-qt-widget-fix.patch \ - "${FILESDIR}"/${P}-jitless-atomic-operations-ppc64.patch \ - "${FILESDIR}"/${P}-jitless-atomic-operations-x86.patch + "${FILESDIR}"/${PN}-45-qt-widget-fix.patch # Allow user to apply any additional patches without modifing ebuild eapply_user
