| 1 |
commit: 0fa4de84533127602887398005c96b6c15fd46bc |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 12 14:57:02 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 13 20:53:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa4de84 |
| 7 |
|
| 8 |
www-client/firefox: fix ld.gold linking from binutils-2.26.1, fix gcc6 compilation |
| 9 |
|
| 10 |
Also removed patches from files/ that are no longer used |
| 11 |
|
| 12 |
Bug: http://bugs.gentoo.org/593958 |
| 13 |
Bug: http://bugs.gentoo.org/582446 |
| 14 |
|
| 15 |
Package-Manager: portage-2.3.0 |
| 16 |
|
| 17 |
www-client/firefox/Manifest | 2 +- |
| 18 |
.../firefox/files/firefox-47.0-crashreporter.patch | 27 ---------------------- |
| 19 |
...47.0-define-HUNSPELL_STATIC-conditionally.patch | 8 ------- |
| 20 |
.../files/xpcom-components-binutils-26.patch | 15 ------------ |
| 21 |
www-client/firefox/firefox-45.4.0.ebuild | 2 +- |
| 22 |
5 files changed, 2 insertions(+), 52 deletions(-) |
| 23 |
|
| 24 |
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest |
| 25 |
index 5c40889..2cabe4d 100644 |
| 26 |
--- a/www-client/firefox/Manifest |
| 27 |
+++ b/www-client/firefox/Manifest |
| 28 |
@@ -1,4 +1,4 @@ |
| 29 |
-DIST firefox-45.0-patches-06.tar.xz 19792 SHA256 4cacdb0ca1e710a0e3f577d5a1253ed14fab9a2d1cdaf83b3fa7bac86cfddef2 SHA512 eec8ccb3d67144368cfad807cad847379bf9ee54c2394f8bf0bda121178b1036ec1d32bea67afad840dff38e1ef26c4c19569d4fa4b553b6e2719bf07a46e017 WHIRLPOOL 7bb6b8f59d86beb9178fbea8bdd372a016b62e00766daf9439e2e59d20635a21b3a218447b09ce7d6a4b601611013f9ad08e088ef8112a41bde9ce951d10bdad |
| 30 |
+DIST firefox-45.0-patches-07.tar.xz 21016 SHA256 76a70ebb3f9c0515c0632170dfeedf0bfb60f248bee579514940148bb3e2b1c5 SHA512 304d6ed4b4c9ac58f3762263207167a9a32532fd48f17d9cc86f5106f7ec98273f402e3779b810b455ceea77d84313ffc8f236fa6fdc6cd5ef21e8159beec552 WHIRLPOOL a50d54d1e3b5c0fb0e8b32c8d69cdeb99a8fbfa90ac51dfa01163ab0228499b08d3ef37b27391d0d5179d80e937447029c2f976f014bf97d0da3e4bc1b58eaf7 |
| 31 |
DIST firefox-45.4.0esr-ach.xpi 426529 SHA256 f43825621ccd7920710608686aa813594afd1d3b19bff8eb49bd32143b81a856 SHA512 941560b81d39ab3ffc7f671b768bab010faab147dfc571522e7362d246e2b5cadc636af6c00692f285122ae2520861f45e69897d1727c9bb110c0a343289a9e6 WHIRLPOOL 53f387c0d38c076cfc5c58ff7467096370959017ef13531d8abe7f6c5a502889148dd3caf1a3598e693c452dc1caa9d3448c33355f375d2a0755ece2a10f4ad8 |
| 32 |
DIST firefox-45.4.0esr-af.xpi 439353 SHA256 93166fd1be0a9b870b3043c752ce7326f7a15a20c38daa40655ed0a6440a8afb SHA512 70b2a20c7fc8d29d750eb28ff63e03101bf84c6282952dc412e85decee141d476eb85ab23f9eb656e8ca6e90705e4ac95d1e2110375695e8ea8d7047707fbe74 WHIRLPOOL 6e10cd75163bc5c724ab132abb51c8226236e089cf8b09b9ad7bdb14abc7294ac89255696aac2a0f0c9556ee6292c83acc8154b88c153d976b42c6dc4b94ac7a |
| 33 |
DIST firefox-45.4.0esr-an.xpi 449036 SHA256 350c7e992de73a4aed0573f679b819e8f79a4f0ed6a98d8a05eaeb8f1eae82b4 SHA512 7279885dbdbee9083c48aef08ad40b6f740d3e9962164d75390203bc71f19a825e87af59a1a3a9495ea7457fe54b266c0ec7316db41465522a0811e303fef25e WHIRLPOOL bbe23b91eeec40d1b8b3ed3389c3a9be374bf7312230e069e5883f697c4c73cd5e199c047011b3c5eb7ecc3825909419bf3fed77c2ced9669ddf57f608c602e0 |
| 34 |
|
| 35 |
diff --git a/www-client/firefox/files/firefox-47.0-crashreporter.patch b/www-client/firefox/files/firefox-47.0-crashreporter.patch |
| 36 |
deleted file mode 100644 |
| 37 |
index 7b3bf3d..00000000 |
| 38 |
--- a/www-client/firefox/files/firefox-47.0-crashreporter.patch |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,27 +0,0 @@ |
| 41 |
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc |
| 42 |
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc |
| 43 |
-@@ -920,10 +920,9 @@ string FormatIdentifier(unsigned char identifier[16]) { |
| 44 |
- // Return the non-directory portion of FILENAME: the portion after the |
| 45 |
- // last slash, or the whole filename if there are no slashes. |
| 46 |
- string BaseFileName(const string &filename) { |
| 47 |
-- // Lots of copies! basename's behavior is less than ideal. |
| 48 |
-- char* c_filename = strdup(filename.c_str()); |
| 49 |
-- string base = basename(c_filename); |
| 50 |
-- free(c_filename); |
| 51 |
-+ const char *c_filename = filename.c_str(); |
| 52 |
-+ const char *p = strrchr(c_filename, '/'); |
| 53 |
-+ string base = p ? p+1 : c_filename; |
| 54 |
- return base; |
| 55 |
- } |
| 56 |
- |
| 57 |
---- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h |
| 58 |
-+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h |
| 59 |
-@@ -3851,7 +3851,7 @@ struct kernel_statfs { |
| 60 |
- return -1; |
| 61 |
- } |
| 62 |
- } |
| 63 |
-- #if defined(__x86_64__) |
| 64 |
-+ #if defined(__x86_64__) && defined(__ILP32__) |
| 65 |
- /* Need to make sure loff_t isn't truncated to 32-bits under x32. */ |
| 66 |
- LSS_INLINE ssize_t LSS_NAME(pread64)(int f, void *b, size_t c, loff_t o) { |
| 67 |
- LSS_BODY(4, ssize_t, pread64, LSS_SYSCALL_ARG(f), LSS_SYSCALL_ARG(b), |
| 68 |
|
| 69 |
diff --git a/www-client/firefox/files/firefox-47.0-define-HUNSPELL_STATIC-conditionally.patch b/www-client/firefox/files/firefox-47.0-define-HUNSPELL_STATIC-conditionally.patch |
| 70 |
deleted file mode 100644 |
| 71 |
index f7fb3b3..00000000 |
| 72 |
--- a/www-client/firefox/files/firefox-47.0-define-HUNSPELL_STATIC-conditionally.patch |
| 73 |
+++ /dev/null |
| 74 |
@@ -1,8 +0,0 @@ |
| 75 |
---- a/extensions/spellcheck/hunspell/glue/moz.build |
| 76 |
-+++ b/extensions/spellcheck/hunspell/glue/moz.build |
| 77 |
-@@ -38,4 +38,4 @@ if CONFIG['GNU_CXX']: |
| 78 |
- |
| 79 |
- # This variable is referenced in configure.in. Make sure to change that file |
| 80 |
- # too if you need to change this variable. |
| 81 |
--DEFINES['HUNSPELL_STATIC'] = True |
| 82 |
-+DEFINES['HUNSPELL_STATIC'] = not CONFIG['MOZ_NATIVE_HUNSPELL'] |
| 83 |
|
| 84 |
diff --git a/www-client/firefox/files/xpcom-components-binutils-26.patch b/www-client/firefox/files/xpcom-components-binutils-26.patch |
| 85 |
deleted file mode 100644 |
| 86 |
index 3daac80..00000000 |
| 87 |
--- a/www-client/firefox/files/xpcom-components-binutils-26.patch |
| 88 |
+++ /dev/null |
| 89 |
@@ -1,15 +0,0 @@ |
| 90 |
-$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/04/27 16:36:50 ryoon Exp $ |
| 91 |
- |
| 92 |
-* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26 |
| 93 |
- |
| 94 |
---- a/xpcom/components/Module.h 2016-01-23 23:23:51.000000000 +0000 |
| 95 |
-+++ b/xpcom/components/Module.h |
| 96 |
-@@ -125,7 +125,7 @@ struct Module |
| 97 |
- # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) |
| 98 |
- # elif defined(__GNUC__) |
| 99 |
- # if defined(__ELF__) |
| 100 |
--# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected"))) |
| 101 |
-+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default"))) |
| 102 |
- # elif defined(__MACH__) |
| 103 |
- # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default"))) |
| 104 |
- # elif defined (_WIN32) |
| 105 |
|
| 106 |
diff --git a/www-client/firefox/firefox-45.4.0.ebuild b/www-client/firefox/firefox-45.4.0.ebuild |
| 107 |
index 02d10c1..cb62d79 100644 |
| 108 |
--- a/www-client/firefox/firefox-45.4.0.ebuild |
| 109 |
+++ b/www-client/firefox/firefox-45.4.0.ebuild |
| 110 |
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then |
| 111 |
fi |
| 112 |
|
| 113 |
# Patch version |
| 114 |
-PATCH="${PN}-45.0-patches-06" |
| 115 |
+PATCH="${PN}-45.0-patches-07" |
| 116 |
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
| 117 |
|
| 118 |
# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0 |
Archives