commit: dedbf1c7f1f2e12ff7907f92bb08d8e32f2ea6c6 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> AuthorDate: Mon Oct 10 01:29:18 2016 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Mon Oct 10 01:29:18 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=dedbf1c7
www-client/firefox-45: moved gcc6 and binutils-2.26 patches to tarball www-client/firefox/Manifest | 2 +- www-client/firefox/files/firefox-45-gcc6.patch | 40 ---------------------- ...efox-45.4.0.ebuild => firefox-45.4.0-r1.ebuild} | 3 +- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 5c40889..2cabe4d 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -1,4 +1,4 @@ -DIST firefox-45.0-patches-06.tar.xz 19792 SHA256 4cacdb0ca1e710a0e3f577d5a1253ed14fab9a2d1cdaf83b3fa7bac86cfddef2 SHA512 eec8ccb3d67144368cfad807cad847379bf9ee54c2394f8bf0bda121178b1036ec1d32bea67afad840dff38e1ef26c4c19569d4fa4b553b6e2719bf07a46e017 WHIRLPOOL 7bb6b8f59d86beb9178fbea8bdd372a016b62e00766daf9439e2e59d20635a21b3a218447b09ce7d6a4b601611013f9ad08e088ef8112a41bde9ce951d10bdad +DIST firefox-45.0-patches-07.tar.xz 21016 SHA256 76a70ebb3f9c0515c0632170dfeedf0bfb60f248bee579514940148bb3e2b1c5 SHA512 304d6ed4b4c9ac58f3762263207167a9a32532fd48f17d9cc86f5106f7ec98273f402e3779b810b455ceea77d84313ffc8f236fa6fdc6cd5ef21e8159beec552 WHIRLPOOL a50d54d1e3b5c0fb0e8b32c8d69cdeb99a8fbfa90ac51dfa01163ab0228499b08d3ef37b27391d0d5179d80e937447029c2f976f014bf97d0da3e4bc1b58eaf7 DIST firefox-45.4.0esr-ach.xpi 426529 SHA256 f43825621ccd7920710608686aa813594afd1d3b19bff8eb49bd32143b81a856 SHA512 941560b81d39ab3ffc7f671b768bab010faab147dfc571522e7362d246e2b5cadc636af6c00692f285122ae2520861f45e69897d1727c9bb110c0a343289a9e6 WHIRLPOOL 53f387c0d38c076cfc5c58ff7467096370959017ef13531d8abe7f6c5a502889148dd3caf1a3598e693c452dc1caa9d3448c33355f375d2a0755ece2a10f4ad8 DIST firefox-45.4.0esr-af.xpi 439353 SHA256 93166fd1be0a9b870b3043c752ce7326f7a15a20c38daa40655ed0a6440a8afb SHA512 70b2a20c7fc8d29d750eb28ff63e03101bf84c6282952dc412e85decee141d476eb85ab23f9eb656e8ca6e90705e4ac95d1e2110375695e8ea8d7047707fbe74 WHIRLPOOL 6e10cd75163bc5c724ab132abb51c8226236e089cf8b09b9ad7bdb14abc7294ac89255696aac2a0f0c9556ee6292c83acc8154b88c153d976b42c6dc4b94ac7a DIST firefox-45.4.0esr-an.xpi 449036 SHA256 350c7e992de73a4aed0573f679b819e8f79a4f0ed6a98d8a05eaeb8f1eae82b4 SHA512 7279885dbdbee9083c48aef08ad40b6f740d3e9962164d75390203bc71f19a825e87af59a1a3a9495ea7457fe54b266c0ec7316db41465522a0811e303fef25e WHIRLPOOL bbe23b91eeec40d1b8b3ed3389c3a9be374bf7312230e069e5883f697c4c73cd5e199c047011b3c5eb7ecc3825909419bf3fed77c2ced9669ddf57f608c602e0 diff --git a/www-client/firefox/files/firefox-45-gcc6.patch b/www-client/firefox/files/firefox-45-gcc6.patch deleted file mode 100644 index c5b861c..0000000 --- a/www-client/firefox/files/firefox-45-gcc6.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1245076 - ---- a/config/gcc-stl-wrapper.template.h 2016-08-31 12:38:43.094770023 -0400 -+++ b/config/gcc-stl-wrapper.template.h 2016-08-31 12:40:12.030579071 -0400 -@@ -17,6 +17,12 @@ - // Silence "warning: #include_next is a GCC extension" - #pragma GCC system_header - -+ -+#ifndef moz_dont_include_mozalloc_for_cstdlib -+# define moz_dont_include_mozalloc_for_cstdlib -+#endif -+#ifndef moz_dont_include_mozalloc_for_${HEADER} -+ - // mozalloc.h wants <new>; break the cycle by always explicitly - // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: - // -@@ -25,15 +31,17 @@ - // same name as the current file. It simply looks for the file - // named, starting with the directory in the search path after the - // one where the current file was found. --#include_next <new> -+# include_next <new> - - // See if we're in code that can use mozalloc. NB: this duplicates - // code in nscore.h because nscore.h pulls in prtypes.h, and chromium - // can't build with that being included before base/basictypes.h. --#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) --# include "mozilla/mozalloc.h" --#else --# error "STL code can only be used with infallible ::operator new()" -+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -+# include "mozilla/mozalloc.h" -+# else -+# error "STL code can only be used with infallible ::operator new()" -+# endif -+ - #endif - - #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) diff --git a/www-client/firefox/firefox-45.4.0.ebuild b/www-client/firefox/firefox-45.4.0-r1.ebuild similarity index 99% rename from www-client/firefox/firefox-45.4.0.ebuild rename to www-client/firefox/firefox-45.4.0-r1.ebuild index 5d30a28..8ba1b06 100644 --- a/www-client/firefox/firefox-45.4.0.ebuild +++ b/www-client/firefox/firefox-45.4.0-r1.ebuild @@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then fi # Patch version -PATCH="${PN}-45.0-patches-06" +PATCH="${PN}-45.0-patches-07" MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"; MOZCONFIG_OPTIONAL_GTK3=1 @@ -132,7 +132,6 @@ src_unpack() { src_prepare() { # Apply our patches eapply "${WORKDIR}/firefox" \ - "${FILESDIR}"/${PN}-45-gcc6.patch \ "${FILESDIR}"/${PN}-45-qt-widget-fix.patch # Allow user to apply any additional patches without modifing ebuild
