| 1 |
commit: aad9d7869e1120a35fe8b5073f8e708cfdcbfcd0 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 1 13:13:35 2013 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 1 13:13:35 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=aad9d786 |
| 7 |
|
| 8 |
Update patchset to include symbols version fix and move build-id patch |
| 9 |
to patchset |
| 10 |
|
| 11 |
--- |
| 12 |
www-client/firefox/Manifest | 2 +- |
| 13 |
.../firefox/files/moz25-drop-Wl-build-id.patch | 34 ---------------------- |
| 14 |
...{firefox-25.0.ebuild => firefox-25.0-r1.ebuild} | 4 +-- |
| 15 |
3 files changed, 2 insertions(+), 38 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest |
| 18 |
index b76e741..67a5522 100644 |
| 19 |
--- a/www-client/firefox/Manifest |
| 20 |
+++ b/www-client/firefox/Manifest |
| 21 |
@@ -147,7 +147,7 @@ DIST firefox-25.0-nn-NO.xpi 332940 SHA256 8ce93d94fb7333edb9cef192a46e89174d8cc4 |
| 22 |
DIST firefox-25.0-nso.xpi 341523 SHA256 2a46e3bd80f79b64c30ea56a60c3e6f3a0469e5034c735962864ceef095b8d6e SHA512 ed10070c8706bf3ae3b9b0f861497099c51bbcfa778fb76230a06516787926a6375ea880dcddd3b8752da5d9c41b4d620cefc9a238cd9b9e7fa09ae26fbccd3a WHIRLPOOL d178eb2bd25c04c1eefb4bbf3968a7e4a97c254e7cdf7bca37c77ca2cde12ddda7ae23c7b007ec74aebf4a3e9eb293260e80b0485d174fb9cf599d0e53d054f9 |
| 23 |
DIST firefox-25.0-or.xpi 370901 SHA256 4093e6a122c50148eaaf72a59d0efa315aee7ca4962585f9d0e381598f08c305 SHA512 8d664663e12f0a39a08e914904ea86d2603a0d62fe7e0e005bc98dcfd55a1548a49bc2e83d705d06b3c9fb8e0931e2ea105681c84c66528bb3de7994fab73f7f WHIRLPOOL f1c5493c7ff24aadce416749d73fbb5c75f7330a450f8ebe308b58b7acf96ba751462e756c8094b636f89311be4aeafbdc2273b05640b61492eacc74bcc09be0 |
| 24 |
DIST firefox-25.0-pa-IN.xpi 370128 SHA256 e040f4a1ec159ff4705ac21ad492835f0ad87e9d0394866b2b14ccc8d21e4d80 SHA512 9b76905d354079c956bda77b72073acb89b12aa60814e8b2809738f188bcd9570c0c02a2c438872c80e0b792daf379b07d11984fec72a0dd570fbc0e91c2acc1 WHIRLPOOL bd2d5f60af29e07a3e003f37400d0f13c4a561b484baf63145883170a018efc41bad4bad61de28c91175e2e6964f01112330c14ff36b9fcc3f4b04b11bd70791 |
| 25 |
-DIST firefox-25.0-patches-0.2.tar.xz 7284 SHA256 351a2dc8d051ab251f060052cec396a85893de1a3d953d2bd277d08f4a340ab4 SHA512 9d0940c9c852aa090cb3886c504c50c1089b80a752199a98a45d5986950b3caca500cee159873691ede50fbacc73e0c3b18e5f11ec9bdac26e6704e86d3b618f WHIRLPOOL 96d2191bb537bbd4345d7a2f87f2b7b93b435d3e91c547394c265cb800e2fa796266b9a49ed89a16e48682bd6411841c6ccfacd00c292f4050f1a0f1129b95f8 |
| 26 |
+DIST firefox-25.0-patches-0.3.tar.xz 8904 SHA256 57f19551fa52e74d253fad9fa4980e00ee152fb1e4b893772303334441da02ce SHA512 211b7e9d0d858b94ab292bd0aa1ca8392d8319646dff7dc47e6048de311898f74c27843651e8c6152b6541f6918ddb0a34fd2bf2445cb48ac6463638c265db42 WHIRLPOOL 98eb119aa3966af647d332583b0de3dcc997d6429542e3c8ab6bc263e368416c0785b76b472c6bfcbb91cda56f985b857b8b3802e5cc10a106bd57b4ba967b36 |
| 27 |
DIST firefox-25.0-pl.xpi 342013 SHA256 6770cb1e255082f78ffd2f3637693a891a61cb51c93cdc87804b88a988e3c77d SHA512 563edeb1465263e94402727f1aad0737b9c8dabdbba75b38845ce8139365e6f687a8d2bc45ffc35d7acd20d4134a2885514da0c6d6eb70d4ba28d8cf153875d7 WHIRLPOOL e2bbf5cc92d4cc9a8b37fb1c8418c612b7e1ea2afd83e93794ae89bce08f60fa1586648eba3fe5ea3804bb36550e82f60376372431b01b4d7ebedf3781c32b9d |
| 28 |
DIST firefox-25.0-pt-BR.xpi 339035 SHA256 2db8e2904331b559dad102c4f4bf0444643ed162e6d6d6853802a14991df3f86 SHA512 7930788617e1c90fce9fb25ffbbc96d6cecd72fa201af82d9e2d2138bfbbf328f9a7cf18ad5c0f02f481ee0d7fcceffa50f25eda143e1fed3675dffc3145f1d5 WHIRLPOOL d8a33e05f908121eea10bfa6dcfa436e40796badd2d3998ef9c76342f30f82c7bbef1663b4ef184574fbb555233618f77cb9d5a39aae43aa8addcce664feea9e |
| 29 |
DIST firefox-25.0-pt-PT.xpi 337163 SHA256 41d73bc8c90cd4c5a67359c68a042ff32825e0736b5481c7998e55720a8c3f54 SHA512 0d7bb46824c6e5ef8e606a6fc4bbbd9f36241f56f93c883a3d2c2496e93d882e048ff30adb2948d3cfd9a05ee0c45d6c239e09b97e77c70fefcb3c1d73bbc1fd WHIRLPOOL 86ad9e3b8914a59543d70c7b04ff1c4cc67f97ade03e82dd4dc85cd7775c42538f9a42c254d91e49c736c264207069f0b91f3414a2a9436783e3e76cbe677152 |
| 30 |
|
| 31 |
diff --git a/www-client/firefox/files/moz25-drop-Wl-build-id.patch b/www-client/firefox/files/moz25-drop-Wl-build-id.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index 221566c..0000000 |
| 34 |
--- a/www-client/firefox/files/moz25-drop-Wl-build-id.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,34 +0,0 @@ |
| 37 |
---- comm-beta/mozilla/configure.in |
| 38 |
-+++ comm-beta/mozilla/configure.in |
| 39 |
-@@ -1285,15 +1285,6 @@ |
| 40 |
- AC_MSG_RESULT([no]) |
| 41 |
- LDFLAGS=$_SAVE_LDFLAGS) |
| 42 |
- |
| 43 |
-- AC_MSG_CHECKING([for --build-id option to ld]) |
| 44 |
-- _SAVE_LDFLAGS=$LDFLAGS |
| 45 |
-- LDFLAGS="$LDFLAGS -Wl,--build-id" |
| 46 |
-- AC_TRY_LINK(,,AC_MSG_RESULT([yes]) |
| 47 |
-- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"], |
| 48 |
-- AC_MSG_RESULT([no]) |
| 49 |
-- LDFLAGS=$_SAVE_LDFLAGS) |
| 50 |
-- |
| 51 |
-- |
| 52 |
- # Check for -mssse3 on $CC |
| 53 |
- AC_MSG_CHECKING([if toolchain supports -mssse3 option]) |
| 54 |
- HAVE_TOOLCHAIN_SUPPORT_MSSSE3= |
| 55 |
---- comm-beta/mozilla/js/src/configure.in |
| 56 |
-+++ comm-beta/mozilla/js/src/configure.in |
| 57 |
-@@ -1096,13 +1096,6 @@ |
| 58 |
- AC_MSG_RESULT([no]) |
| 59 |
- LDFLAGS=$_SAVE_LDFLAGS) |
| 60 |
- |
| 61 |
-- AC_MSG_CHECKING([for --build-id option to ld]) |
| 62 |
-- _SAVE_LDFLAGS=$LDFLAGS |
| 63 |
-- LDFLAGS="$LDFLAGS -Wl,--build-id" |
| 64 |
-- AC_TRY_LINK(,,AC_MSG_RESULT([yes]), |
| 65 |
-- AC_MSG_RESULT([no]) |
| 66 |
-- LDFLAGS=$_SAVE_LDFLAGS) |
| 67 |
-- |
| 68 |
- # Turn on GNU-specific warnings: |
| 69 |
- # -Wall - turn on a lot of warnings |
| 70 |
- # -Wpointer-arith - good to have |
| 71 |
|
| 72 |
diff --git a/www-client/firefox/firefox-25.0.ebuild b/www-client/firefox/firefox-25.0-r1.ebuild |
| 73 |
similarity index 98% |
| 74 |
rename from www-client/firefox/firefox-25.0.ebuild |
| 75 |
rename to www-client/firefox/firefox-25.0-r1.ebuild |
| 76 |
index d114c25..42b0d84 100644 |
| 77 |
--- a/www-client/firefox/firefox-25.0.ebuild |
| 78 |
+++ b/www-client/firefox/firefox-25.0-r1.ebuild |
| 79 |
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then |
| 80 |
fi |
| 81 |
|
| 82 |
# Patch version |
| 83 |
-PATCH="${PN}-25.0-patches-0.2" |
| 84 |
+PATCH="${PN}-25.0-patches-0.3" |
| 85 |
# Upstream ftp release URI that's used by mozlinguas.eclass |
| 86 |
# We don't use the http mirror because it deletes old tarballs. |
| 87 |
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/" |
| 88 |
@@ -147,8 +147,6 @@ src_prepare() { |
| 89 |
EPATCH_SUFFIX="patch" \ |
| 90 |
EPATCH_FORCE="yes" \ |
| 91 |
epatch "${WORKDIR}/firefox" |
| 92 |
- # drop -Wl,--build-id from LDFLAGS, bug #465466 |
| 93 |
- epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch |
| 94 |
|
| 95 |
# Allow user to apply any additional patches without modifing ebuild |
| 96 |
epatch_user |
Archives