[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2019-09-01 14:20 Jory Pratt
  0 siblings, 0 replies; 10+ messages in thread
From: Jory Pratt @ 2019-09-01 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     1ba4b9bc9e5a38a479cbf6b50c51487c8ee70ced
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 14:20:43 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 14:20:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=1ba4b9bc

mail-client/thunderbird: Clean old ebuilds and files

Package-Manager: Portage-2.3.74, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 mail-client/thunderbird/Manifest                   |  56 --
 .../thunderbird-60-sqlite3-fts3-tokenizer.patch    |  99 ----
 .../files/thunderbird-60.0-blessings-TERM.patch    |  70 ---
 .../files/thunderbird-60.0-rust-1.29-comp.patch    |  37 --
 .../files/thunderbird-gentoo-default-prefs-1.js-1  |   9 -
 mail-client/thunderbird/thunderbird-60.8.0.ebuild  | 602 ---------------------
 6 files changed, 873 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 6e01583..46c8892 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,62 +1,6 @@
-DIST firefox-60.6-patches-07.tar.xz 37404 BLAKE2B 5516ff768bee0253131381fdba3e08785ab31bb29e44ad7f7e2956fb7624fafc9bf22f892ddbd0617e5e7d18500686a9975a60ea77d23a2853f35936cd142030 SHA512 3c4160e632155b0a239e22d0c1b1c701545b0f6d0915f9bdcf3b8431cee1abf650191ffafc5c3224a61279c8b1b52a80444c811a3914e16127411991c963292b
 DIST firefox-68.0-patches-11.tar.xz 15404 BLAKE2B 5322c64f7605e30aa1daf650cea19b66ce6c305d2862d76c4a4103676392cbd3029a8f35cbe8ed8077ac7cfe8194c08a0cd3cf25fef75c62a086077d0c5a419a SHA512 1897303b6864ca941afe6ee1d95fd975fb29a01f52d68f9f42c1a9a62d7e4fee0a797aa169b58dc4cf068916e01edaf5c9ad8ade23a997e52c37bd393a142ade
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa
-DIST thunderbird-60.8.0-ar.xpi 627180 BLAKE2B 31d1631f7ec6320830dcf3545a5c3bd9fa346c6d8807e25f8c2071e7dbcb9c04858f2982407154d68abce45277ba96f650971268c389be4691f546464813725f SHA512 c92af1c4eef761c30ac2bbd6a333a18826534f35bbe6f5a0da342cb9cd354151bff4bbcb48cf0b804657de1f8e67c385c4c6ebf14d92a0a6cfc39f34586f961a
-DIST thunderbird-60.8.0-ast.xpi 559643 BLAKE2B 763f6bce63732bec4b01c28f597e2e1948394f5cb8a404f0bcf5ffaef663d8b9ff3e8b09141989347f944e16c841255bbf32ae50614aca25e12e5f2968872e9c SHA512 bb61302d2e14362819a99df3de4e6309f778f025f85758b927604391a0f872d6df63a0b69d669f008972863fcc230a345c1cab9b961d5df4e2a403648c484a3a
-DIST thunderbird-60.8.0-be.xpi 659079 BLAKE2B 698ee1c4c58a8d5e6ddcedfe439ebd4e91a648ae9fe7d7040075f5cdeed733442ab6b933bc10389b58d2c35eaab14735dfb2eabe65e2ce956d0f133c51f4e27c SHA512 a73da736f77c7ff6947534aa7557ec11ea302ff378394d5ceb2cc1b6365bb36f81b556dfbb66c5521ded65168f2fae3a03cd3cd0f59d030093553590a21950e5
-DIST thunderbird-60.8.0-bg.xpi 669318 BLAKE2B d3017dc198e9aa0884a63adf52c2dd5f617613403d1b882d21e040310c2047643a944ec91d069ad9c8cfe89369a09a097ff8c056cfb0c39c7d18e8ddad5438d0 SHA512 0fa3b36072a4d3371e07169990cc18ed8af73dbe824cfd5af2f216d059781f4c56081644e86c26a7b7150257e475c5204a41d72bfe99e327720df70ea6cd01c3
-DIST thunderbird-60.8.0-br.xpi 580370 BLAKE2B aa38fd21ded1067ca1bf5324a8abf02b2ab767591b7bbf5d43c68650d3428c35eb91f72e14189cad542f72ec8cc2709a6d443f3097e85e17921e40601552f66f SHA512 44d3b65877c63a0af035015d7c8013e1577760ca91e367edc5236e293d27dda6eb5166f608aa660fc09e7cb830598890f1ae52f3f296ae6169b16da57cb867e0
-DIST thunderbird-60.8.0-ca.xpi 591971 BLAKE2B d73e5322ef1541047ad3fc52d37a1dcfd666aa86821cb310c8bdf6f9bab0a752dffe434c775f663ec526287bc8eeefaf721d9fc9d8f7d8803174e859bb51599b SHA512 7daa322f628acaf38ed3df27c07f25cc79cff78d2ddf4edb3c499032519ea387bec028954744fe78736c96faa8a8d2c25158ff304ce2af5903d02b61a944d60e
-DIST thunderbird-60.8.0-cs.xpi 611203 BLAKE2B 7a180af22d94001026ade7c38bbbb87d498308899cf988fbcfac99ac99124d815371cf60624502996d9593ce6f45d76a8b8f7400b6944c3ba7c9d57ac3bbc9a8 SHA512 64697bc83c0db92bd48e6a29e3520056e86afe7f12475a96b1b593781cb596baea500736347d51e27fc2f0a11359ce69bc6cfbc07f4354a2a3e1946944b0b5dd
-DIST thunderbird-60.8.0-cy.xpi 586039 BLAKE2B e98e6f253f83f4766a3e4e5981129e2a42be38c6cbffcd012be2d59a128fe4f5ba5a13593147fa758c958e375edfc1e6256da65f803573342848e96f6c489918 SHA512 df91f59b9e93e7a467657c4102f28d999833f19e3a810cd39c090992da89f6ec62aa34ab391b651b95ca1e38ec8fc44f9ee401ad104288b52b7d8313da3a41ca
-DIST thunderbird-60.8.0-da.xpi 570807 BLAKE2B b64d07878b20b7e38cebd5cb7ad96ebf21dac66b82665bfcce02abb6475faa772937b983de87326e5ac6a4867a3a90934d26afda49d18fcc714da3f869ee0691 SHA512 a2de79bf83c5eb1f77f175e97332fada1bda0cd353e0ad575c7ed568a5775fb508cb48ea751979c13f848f8fad66b06019d381835e22b0b41632d4e2b1d5f924
-DIST thunderbird-60.8.0-de.xpi 582575 BLAKE2B 544ee241959f6b0f0acad13c01c20a114fd6b4090250a5b700b9a56ae45b7a6e017437987760d9d215f93fc89ee8188d2ea6fcb4306b0e45ddfd91e467eb5aa6 SHA512 6bde7bc5e4c1d16b2ce758b7dddb3975b39984e07f73825f58c0c030c29d47e0968d7de0deb2a144e86f8e73e87e01a39712552d4d7d22feb20a7dee3c6564d5
-DIST thunderbird-60.8.0-el.xpi 694860 BLAKE2B df7c3e197fde52f53b627f2506b9b0d54fb6eddcccbfb920f1c83711f3bdf3829a646a9fc3960d436428c0f07e4fd0074c11b32e222fc6c1374e4ce2c047a32e SHA512 0be4a1ab3444a7e2b53ddfbc4774bbc0ced663ff726cbb173550050342f935fe1bfcfd8aeabf556a16c0a3bc0b2f4483a4851c5d86fe9939d79f11169fc5e44c
-DIST thunderbird-60.8.0-en-GB.xpi 553895 BLAKE2B 238c7abb07405834f9e29d911e99759712b5e2b795dc8ab51c5810ed0769b0f063a692db67ff9e1aff75ee1d2c1b3b49fc36e149c022ce3e2aa717132e212901 SHA512 e955f9ea391eea87dec7981f5b88c0a43a8dc86212798abdb921a8b4ce048e7d617f864f926686fa073b7bb6789b4f7f39969df2a319f571c7fb991c4bb981d8
-DIST thunderbird-60.8.0-es-AR.xpi 595049 BLAKE2B 0ffe6c2b300aed0da718d29a276f024e4bcfb71d9158b034817ea585a2e26f8204251d199331ddd6e67bb4a7f4ee0251297bf4ab67412c448c5a22fe4d542eb0 SHA512 bd036fc6c83065ca148955a9c92e148980b6d93f7730eb08faef8f7449b32eeecaf8f8c2caf05050302a010709b377d8e9b81a5ba00a12c8fa53fa1303c2a88c
-DIST thunderbird-60.8.0-es-ES.xpi 492212 BLAKE2B 620087bfdc780f9666c820098b8ce6ddc8169514c32a40e64207956ba7b430f39f51248759f45cc4c6154b943c3fd0d5306f19e6ce419635cc0c6af0f60bcf05 SHA512 b48debb9aa2c64074e5dd315140bf0a09126345dc05a1685ea9dec18d25b7cd639b1c07167764ec0823f623cc83524daa07898105098dee6a03e1770d60e42d7
-DIST thunderbird-60.8.0-et.xpi 570868 BLAKE2B a3f9216422e27c75cd9cee262d6deac3d93185c14c6f6179e7306ad0e77e1edcef43cbe1e8778f1497174e6debb79fcdd95c2e69403dd9de59fc3f9f1772f7a1 SHA512 2b0a5455c1664877fe5530422248e8fbfcb1b97e68e264a1fb771ed787f4baeeed758fed4be66a0c389888154fd5f08de8032ab4651188c35cff9fe8a9525371
-DIST thunderbird-60.8.0-eu.xpi 581385 BLAKE2B 70870b9e17677a826486f08f293f9272368756d5bd5dbf0ddb0119df3b7a4596eb5e1405568e3574f40744ddfc48f52e8e56bf47b2f3f704d5a2e6dffc4d0e56 SHA512 30ef0e8dffcb2b42ad3efe43c8a0ab6895a757ec4406de6911f6444840384e427bcb517f8d4eb7a8294567d55f67545c4b8ce593aa063f2e843957c17eac715b
-DIST thunderbird-60.8.0-fi.xpi 575755 BLAKE2B 3176cdedb8a8c9dde11e361687716d3f8978dd3582b0ce677a84967a3bc7a595be37da52f9d22e2a03afd10ace0235ab8e15a9ba34b27ae0babe61cea19aad0d SHA512 b6595fa0e1ca4baa353705c0067ea05a4d1daade48c7de057356a5aeaccc19d666a0648ce2ff5108ccd3464ed3f4e1b59cac48dcba1991426373a04fe1323230
-DIST thunderbird-60.8.0-fr.xpi 608467 BLAKE2B c6b368a0b0a573ad5fe24f473c472ab3250a441a899b11c5971c614a863714ddc3683ab50183b7d408ce371fe3c06759ca2de242884f1796198c272230bd5e71 SHA512 bd76b229973e795516fe6f6c8d3dd60da986a26a915a622450e823043741c8fe6d526d29cd3566faf5bcd78109da89853747a24790ce448ea4f4b072efc18c8a
-DIST thunderbird-60.8.0-fy-NL.xpi 593851 BLAKE2B 37898ec4c76a8741fa3e896160f2ca28686f2eb85af3d5c709df7a68a39a47c0e95408f4c4e46a6de5349699259a390071cd4a559f583377cdcd783e20925ac6 SHA512 d8c359757cb0514271208977df3dc4b40f49287001198fb09e3199866f0712d0bf7c3f4ade3216cd08601ffa7c6b8cf2ca7e2cc91856819d013bfa43940c794d
-DIST thunderbird-60.8.0-ga-IE.xpi 603506 BLAKE2B 7c76830f4d1b34e7ddeef6498a2ddbced3cd07d9d7bc75deeae78792ede033de173f9a0e95cbc93f668f2be56c2c5f07e5bd3c93aac6f216cd0355ed70cde005 SHA512 7f1c59d222fc98825f3aa8eea6c6a122aa904402d3d499d67d26743588da003c6e92214e1492a1b6aa853397161c3d450c6fa4830ba5e3ea75a8fcbfc1f4e662
-DIST thunderbird-60.8.0-gd.xpi 599262 BLAKE2B ed96d797e80caab3867185c0f9d8afa51b1a6d0ae1d37e6a810dba2f9041bac2a16e7d62b0bf149aa2da9ef06f8dd8d46d31f0d05dcae0c0e7364d9dfbfca8c6 SHA512 bb6f36d842a06e34199bf90bb8511b1a91d79fb0c6e073f125b0a555f344d531bcdb9bf78c804472414fcadcff0e66a9bebdc64e0d0832e19fce5dbe3671f3b6
-DIST thunderbird-60.8.0-gl.xpi 580343 BLAKE2B b12d06a801864c9627569f0dbe6b77bd5d2c68b30bc0159d0bba3030b88c26d3252e735bd1d334859b5793170e57cef0002ef84605e216e9328b3644fc9daceb SHA512 666f13a8229f73966456975cc51db9bfbacf2645f887cc072ae0998f227acd6f33c4fafee8a7805f8e8850c9043ed6a05ef9b9fd261c1ec9ebc53127bab2d26d
-DIST thunderbird-60.8.0-he.xpi 617144 BLAKE2B 832e397c908af6422314231333db15f1cb75e307136839e8253d4657456ae2985f8d953e5fe2f5ab5906688fc5c3817c9242b7b24ee006b8549ec95b8321aa5d SHA512 40e66995e06d39d11062955257761d3a6539bbe86849fb14f0a9b111d5556d7edd591abf2a4498ba7e226c2fa13031ebd2f0cb768cdfbc170249cf0586915608
-DIST thunderbird-60.8.0-hr.xpi 582239 BLAKE2B 199bb41a3745cf5aa7d72627d5e2634ef093ed0d93b78be9223a5a4fb5f00f17945d2a37bd1124991b7e6ead746fa0a158ffe08a35f731f88955fe292b6dee81 SHA512 eade1cb89a5c5ec4dfda113774c6a93f68676faf584b0bcc4b6d25ca45c635b3e7e48bde6748e14b899ec0ab5370e1259dfdda0f6a3221bc6b4eac79d2675295
-DIST thunderbird-60.8.0-hsb.xpi 615132 BLAKE2B 4e1e51adf45fd1d09249691fa17c19d0ef522eb8041a301248a9943c7def37f3b604defe531743550ed0cc8788d58f33d21aa95cc97afb4402e929e2a4d978ed SHA512 3efafdca843a17dd950e637fdf58b4003b21ed76afd52021c0b5f428cb218370b57a7784be2db5be7e2c23a937089a5fca10463b778e2d080cb7b7d507838a77
-DIST thunderbird-60.8.0-hu.xpi 615345 BLAKE2B 3680b726ff6b5182d6e1756d2520dba3417939b4a17e5731573182523d32c92c1d0bf11ed6abc9c48713c80590c557176d6858ce0312003ae2e838076dc95eee SHA512 b33b88f566f42e0bc3a80ea2b1e3300addfe0379af5997cd53da4ed6af67bceb2c6a1396de78f788a14b9541518f118e7ad455fe78512019a6cfad5e899d7c17
-DIST thunderbird-60.8.0-hy-AM.xpi 653531 BLAKE2B 249acc09dd0e527c189c0a1602b78ce17d0ae19687ccf80229e3c0aaa8783ea3123da47657432730425a012b6bb73f54b1c3a59eb8ee00ceda24c86d15c0e1a6 SHA512 7c03aac474651a64d7714074ab9b0264fbacd2858f87bb014edd0404111335a5ca36eb3e469a515a83aa036a5439ec4110c42680b3a8b49412c5c072662e1191
-DIST thunderbird-60.8.0-id.xpi 568861 BLAKE2B ce63557ba7626aa03eb4bc395ab7f9488077cb51924b91a87ba7cf0e7f0f4c9b25854f0f778dda7edeb330ae2e3a621018998e9aff87dc4d019f0c91f8e4cdb8 SHA512 685424c205f9d89ae1105beff1964afcf511b44450b6b0f9e19d49e5fbc9edc70dab7533c7c9e2b107bdceb0c0bd9eeff8b9814dff08debb9dcacc681c408c9e
-DIST thunderbird-60.8.0-is.xpi 579047 BLAKE2B 0a1cccf5be68e79273ed4e4943a348065a7fb33c2b5571e5f0ae9a0d2a2edd2f262e29ba3fa17311b5105a8b55fc107fa0eb69da46a5447da5e317d8c187584c SHA512 e1bceb4c8fec5582c8a1eebaa03c6f64876b2d6f4d8cc921a4a76eb380f361003109ddfe05ec249fe8eaaf4c6606e68ed4f55bd93b5160f058abd611de9c1e55
-DIST thunderbird-60.8.0-it.xpi 477500 BLAKE2B d0a8cb5f781781e16aba1b303e17e51eccf2d04a86670e6195c8ca14b909229bf5d2f9b978b2a43dfca5249a23bf6974ecd156cf075394d3565036308f974516 SHA512 fa4cc59f1b64a532b2d31c2ac82f8153284b0135a669b3da36984289234f54ac94474885ab73e525384f3cec93c46ead53d00fa888d3163663696d94a06cf460
-DIST thunderbird-60.8.0-ja.xpi 653344 BLAKE2B eb2e2cb15de3a8a0f935c6e6b167e93e3178ed7295e084fb4632784ee4d2439939efca2341a2b21a6e6cbf40ebad1498fba8fc5ac9cea37db1d8e856650f4af3 SHA512 670a582a4bb8c52903bf00b3aaaed74d9ca29c58a7ee989f20d006771c2e00dc4b512db51617f1c9e65a98441901cb31b9933189a5af07f96a11c4632afd4358
-DIST thunderbird-60.8.0-ko.xpi 619731 BLAKE2B b46a1fe32e63269935ecf697e327f8f25477ce05987bd51fb673e3265985c48b3097395f1e96680eb06af4b149be286f3ac97a459412d15b36026dccbc4a173b SHA512 cee7843a94772578145f03a4726b0d60ea513800365cd7c2fa85c94fbeca536ca45d5203fd091d6333834e6345aa31febdbd27535ed7a11782b80e597765d8e6
-DIST thunderbird-60.8.0-lt.xpi 605441 BLAKE2B e1ed67ec3ecfe5b741cf49537802d3ba634d8ffa562bfba7eb4d8d55c2c76321d70fa5cf2d711231225000267268d7e1df768bc4aba6ec13bc9c3720492e6332 SHA512 7779f34c8c041c29672781cb9e48934fd81ec6a3d2af95db9a39e33c650517d510e527578b8355fcb87b6442b0998004ebf07a57c060d8818c156bbd2487a548
-DIST thunderbird-60.8.0-nb-NO.xpi 577003 BLAKE2B ee86125d4c34291182a98197c4706555e2003b7667ad516341382f3b351670660398f9077cd49901751e4bd58dc2cd37f43ee556bcaadff500260ea98c6e2899 SHA512 53f956cc91a834c69d711fb23f7c4628159d7e3c3a33af9b861c0666bc26279c41c793906a332040c2caa3404a5a71aabaf4082995eb94121ee3a75a5e3745d6
-DIST thunderbird-60.8.0-nl.xpi 583914 BLAKE2B 104a06a3edb470d8bc2e1187f41d5edd28f083a4e93030e7c8a2150833e2e0f2abde9b7257cec7193db0dde5e602b7506cf2f2b8f63680d04fce41cc7729e554 SHA512 44001fcd69c370e12c55891afbe5be79cd7360d3e8b677f1682b4c37601c6a0dcdba68525e0627a537018d1c84b0810fa6b241d980125589f30818cd614cbcdc
-DIST thunderbird-60.8.0-nn-NO.xpi 576422 BLAKE2B 698d282efda0750ab2bdaa818c3f827286d6225f0969ea16a2de1e727bbce02434b08f7f409e0604708b5f813d2a96297e0d24daaf48dc2e572d32db1e4fd03c SHA512 644e7440a5a47c34a281484a3c16c55037eba782ce51717adfc4306f38720a0d4dfa24b59344bbb1affb03de55dc21984b58497450912235cc96668fb9aba748
-DIST thunderbird-60.8.0-pl.xpi 480726 BLAKE2B b3d10588582f8855d714d505e1cba7da8e6a67f1ba752cea52c1396ddcc79d0ba57774889ed3fb7168f8468bb2d3cdb44c11bb457483e8729010f130be900d24 SHA512 ae494b7bd0e0f1287ee6291e6b4bd2b869a8f4ef74113aa88cc53789a75b4190e9d128641feea425804a6a26f853686c4410bb5bcc7253ab89500255a07db03c
-DIST thunderbird-60.8.0-pt-BR.xpi 588834 BLAKE2B c1b2bb38edf447d91642f766e5b394cb44e230c7011b8296979102c5ffc93880e811bae5a7b13efc45e95d06ade6a60e8c21ae162dfbe65c8703dfdf373b03b9 SHA512 bbefc1b55be40d9be280292bd48c48e555dd2d6535f16b4155940e2cf3f2119b6b0d3da7fa83d66e5f530eb5b3c40aa4b7125d249feeb8177063888c26530568
-DIST thunderbird-60.8.0-pt-PT.xpi 593186 BLAKE2B 8e5804d07d6b62f798598365ac407443e5fcdd49a304bb6135fe3fa88a4f1d62718160082986f35854114708cf43931984ae15c948bb986a58bcd03752a69c4d SHA512 b88106161385d9853febfa40666d5fad961fbd331030e382f6ed681ebeb5046fb50daaaafd04a551bc9dab9f50e16aea3fca678d09de93461b4279933314431a
-DIST thunderbird-60.8.0-rm.xpi 578384 BLAKE2B 6527bd3b39ebc26a7d13fa1d5d99ca26eb3547925d36638151c489694c0eb8a74a2758397ae60304b1504680b7181c20a1e86280889f274d1c87e6396cd4a25a SHA512 b7cc627d0c8d367dc6b6ea9a56d5e60dfbec41708cd36c38856d5cee3e9e5cfe7949681fc00714105b6f9d989aa26ec56eac3c3165402f091deb83fbdc01de72
-DIST thunderbird-60.8.0-ro.xpi 584308 BLAKE2B a2c247aaf096cbfa955645c45c8ffabfebaf93dea4c8ab0f7904ddfd3de0e0b751bd4ca06a000ca2e7d74ac959a131c592f3a942fc4a49f21e0f5f96923c07cd SHA512 d413a9f5e04520448b38f5e8729b0ef939a409edd6e8c5409c3fef397056fba0a0d0b323c04c203114b3e5cb37fd406242f9e508e25707719d4eecfecd99f557
-DIST thunderbird-60.8.0-ru.xpi 694706 BLAKE2B ede404c70f22ce9d9cf54c9551386a62cac1c6ca5cd64219fd4cdf793ce26390107db9b04fdc22885aca1c1af36d1e4ec9f95256f840fa7655cee943ad083d97 SHA512 9b868097cb556cff75d59c55fcb56c7688cd844703b346d629e21669d0d10df2dd2c5d80aac2370a62f3eff261819102e6b25be14dc30f3b64fd3234fc0c487f
-DIST thunderbird-60.8.0-si.xpi 647589 BLAKE2B 73f07401247adaa19d7f1ba544b13706459dac4f15454d33ebcf3f49f3ea7ed6d14f8adf3768d56a10d6d08b8986d5a6bff4ec4b940254e25c3b090b561e01a1 SHA512 81d44f9bb1f234d643520164ec5b06c34a2fde0438498ab1c927eafd64a8238148d608173e7c952e582e1357d9e65600748d1c972ad38b5cfa44f5e5a819274b
-DIST thunderbird-60.8.0-sk.xpi 612217 BLAKE2B d8cf6ed4b46d686a0bff800511f4e2cd828692c002e79321bf99f568ba9ddbf68b0f1eba452d95536c83426502e81dec137c31a686158ef0b04886b2f78c6bff SHA512 6c22ccd50ce86f0a70f2b81b55ecf971fa39dd068f4b5250e551a68dde24129023ebbc59c65d8d519f09a2a7bbc62a88216da917365769f2759d6f764ca10dfe
-DIST thunderbird-60.8.0-sl.xpi 589947 BLAKE2B a1b053a2bb45056eaa4dc562cffb1b25dad4b5f74d0a33629bcfb54e49862bf9fbe26c7c6908a0f2a34bf6d07095cb851e16c2e94b29431993c5b47e66f35a16 SHA512 12eb163775da8dc77bd75fb2a3610633285f4b35cb2ee7162905a561e7447c54ce4a95acc20f02e0056ec34193f8bfca9e18dfbc78017615e775a82ecf0ca9bd
-DIST thunderbird-60.8.0-sq.xpi 593096 BLAKE2B 968a923e5680f6fc90fc670e48068f9b8c06f0feb33486f5ea6e5d7b8c94cf9e1d0812a99530185bef0ab1326b173592cacb5b812471917223797dc464889100 SHA512 2e9cfe30fb25c023d370028ee3f81177a25bcfa65505852d57fc3362582017a92ba4acf1a85e645b9aa7cc67d4cb1bb0c5da7017c8deb95c5166c83e993dd9ae
-DIST thunderbird-60.8.0-sr.xpi 641527 BLAKE2B 7f7db0d1aaa29a00df668cfeab6830fcde133d930b2317fd7d4edb370483483caf65487406a480079b9554627205e9ebe4148c6429e08ba8fad16ca2a9eafd7e SHA512 5df131d60f6e88b50849e45dcaecf3db60ffe1f0d60c503804e14ae84656230be245e97d6fcb4546c57ce6d74df1b6b856a693c285cf12dfa412d960a3bf878f
-DIST thunderbird-60.8.0-sv-SE.xpi 594078 BLAKE2B 520e036c5650fcc70e6d20d16c9bc435c4f0f1d5ccc02539b7763760601cc015886b009cfa3e34d41a1ecdc318522fd1672f75236d507b926a5c8acf91fc4a13 SHA512 2552f42a10eba2b27b39c373cb94ef0e990bc6c5712c585635f420b81ac891035843b8fdb90b9fd70430c39e8d730286005bd2334ff255574e7d32370f40fe98
-DIST thunderbird-60.8.0-tr.xpi 598011 BLAKE2B 643705ab19e76136f016d3bcb57a9c0fa4f1bcc2b2c8648e20d8caa9ae336c66cd2e7a720575f9bca8fd734a17e6bc262efaeba7caef932d5811724e3b5fa805 SHA512 5641107aeaa4882373323c8abac60b9312b413e8f706c293d25df981fecd25490be4aa0ec672befacacccaf9b47cf933ec4c58ecb88f391d42b9cf9db62a8d05
-DIST thunderbird-60.8.0-uk.xpi 684155 BLAKE2B 14fab464620240a30a650c4371ce790d91c6287dea8fdecd69d77b55086fba8a87a115ae11fd12d753a8efb47827936bf057ebe300939cc6e612ca67de971c0f SHA512 f45f607c5b3a4bb411afc7126279160e293f04cbb8be4a9a0b6e62f431a860656eee7e57c6761d5709aaa80b244c48c026d294ba54214276b770341ff225ad3b
-DIST thunderbird-60.8.0-vi.xpi 637187 BLAKE2B 7ecd85e521b230a2de85382f0ca2588523e6a0a819124bd440cc34859230d89f827fc2ad3e193dcc5049bedf21fd1ce3bc177c6451278eee13623532828d72a7 SHA512 47dd90cae041761fd58db8a9c9b1c97e7df1933cb6f2e36f11376d683cd7f802fcfb74d8887b5333222484daa1e6c925608d54a4ec30f1ba8d6b234dba324407
-DIST thunderbird-60.8.0-zh-CN.xpi 626284 BLAKE2B 90576f52f491b6af98489ee02fd48a7e27ca25eb4090986abe0ae67edc866240fc77e3b9aeeb768759eef9f2cc0b138f6aa60f59473ad2e6d786e578ff5da194 SHA512 35fc72b7894b7a678c57e8b89332a3478bd8eb49db01e8cd74f9a347466f577ddbcfa07dde487478e9c120d462ada430b0a569ab50114a0f603cbceb8223a137
-DIST thunderbird-60.8.0-zh-TW.xpi 626190 BLAKE2B e388d36ca6963d406372af7d26e9ea612cc69633a162fdf96f298a4d61753058cabdc5c4f400345751e7485a4f1bd5d75cb129dc993722f796936f3659da0ef0 SHA512 41abd5e0a83bb8da396e1b3f469be9c89a09aef74f2a6e9ee7cde27b8d09980b2539d1c36571b65cdafb1bbf765c671105c519db63aa33131781125dacdb3a83
-DIST thunderbird-60.8.0.source.tar.xz 285643576 BLAKE2B 223915c001c19908db5a4d6a580ff210f45b5c61a06212ba630a2d1b348b49b7067985b3ef42ee1f69fdc14725aecafd36ecea55af42cb6f6e4e00197ffc2178 SHA512 b465544a8cbedf0aff0f737cf98e2d030331f1ea016b2e541dfe30a5cf3172f9075e5a9c8d6b7e0f97ffc2e0d3eebbaf9a39e76a499b9fc976bbc0c944dfd058
 DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
 DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
 DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8

diff --git a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
deleted file mode 100644
index 48ebbf1..0000000
--- a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-# HG changeset patch
-# User Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-# Date 1543532530 0
-#      Thu Nov 29 23:02:10 2018 +0000
-# Node ID 1c480085935783bd1d240860bb44f410e2d36322
-# Parent  6453222232be364fb8ce3fd29b6cbcd480e5f2e3
-Bug 1270882 - Enable support for SQLite custom FTS3 tokenizers at run time.
-
-Do not require that SQLite has been built with support for custom FTS3
-tokenizers enabled by default. This allows to use system SQLite in
-distributions which provide SQLite configured in this way (which is SQLite
-upstream's default configuration due to security concerns).
-
-Requires exposing the sqlite3_db_config symbol in bundled SQLite.
-
-Disable no longer needed setting of SQLITE_ENABLE_FTS3_TOKENIZER macro in
-bundled SQLite build.
-
---- a/db/sqlite3/src/moz.build	Thu Nov 29 19:08:28 2018 +0000
-+++ b/db/sqlite3/src/moz.build	Thu Nov 29 23:02:10 2018 +0000
-@@ -58,10 +58,6 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
-     DEFINES['SQLITE_ENABLE_LOCKING_STYLE'] = 0
- 
--# Thunderbird needs the 2-argument version of fts3_tokenizer()
--if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']:
--    DEFINES['SQLITE_ENABLE_FTS3_TOKENIZER'] = 1
--
- # Turn on SQLite's assertions in debug builds.
- if CONFIG['MOZ_DEBUG']:
-     DEFINES['SQLITE_DEBUG'] = 1
---- a/db/sqlite3/src/sqlite.symbols     Thu Nov 29 19:08:28 2018 +0000
-+++ b/db/sqlite3/src/sqlite.symbols     Thu Nov 29 23:02:10 2018 +0000
-@@ -45,6 +45,7 @@
- sqlite3_create_function16
- sqlite3_create_module
- sqlite3_data_count
-+sqlite3_db_config
- sqlite3_db_filename
- sqlite3_db_handle
- sqlite3_db_mutex
---- a/storage/mozStorageConnection.cpp	Thu Nov 29 19:08:28 2018 +0000
-+++ b/storage/mozStorageConnection.cpp	Thu Nov 29 23:02:10 2018 +0000
-@@ -679,6 +679,10 @@
-     return convertResultCode(srv);
-   }
- 
-+#ifdef INIT_SQLITE_FTS3_TOKENIZER
-+  ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
-+#endif
-+
-   // Do not set mDatabaseFile or mFileURL here since this is a "memory"
-   // database.
- 
-@@ -715,6 +719,10 @@
-     return convertResultCode(srv);
-   }
- 
-+#ifdef INIT_SQLITE_FTS3_TOKENIZER
-+  ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
-+#endif
-+
-   // Do not set mFileURL here since this is database does not have an associated
-   // URL.
-   mDatabaseFile = aDatabaseFile;
-@@ -746,6 +754,10 @@
-     return convertResultCode(srv);
-   }
- 
-+#ifdef INIT_SQLITE_FTS3_TOKENIZER
-+  ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
-+#endif
-+
-   // Set both mDatabaseFile and mFileURL here.
-   mFileURL = aFileURL;
-   mDatabaseFile = databaseFile;
---- a/storage/moz.build	2018-11-14 10:14:14.000000000 -0500
-+++ b/storage/moz.build	2018-11-29 17:05:42.106058951 -0500
-@@ -101,16 +101,20 @@
- #
- # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
- if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_SYSTEM_SQLITE']:
-     if CONFIG['OS_TARGET'] != 'Android':
-         DEFINES['MOZ_STORAGE_MEMORY'] = True
- 
-+# Thunderbird needs the 2-argument version of fts3_tokenizer()
-+if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']:
-+    DEFINES['INIT_SQLITE_FTS3_TOKENIZER'] = 1
-+
- # This is the default value.  If we ever change it when compiling sqlite, we
- # will need to change it here as well.
- DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
- 
- # See Sqlite moz.build for reasoning about TEMP_STORE.
- # For system sqlite we cannot use the compile time option, so we use a pragma.
- if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android'
-                                     or CONFIG['HAVE_64BIT_BUILD']):

diff --git a/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch b/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch
deleted file mode 100644
index 975e0cf..0000000
--- a/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/erikrose/blessings/pull/137
-
-Fixes: https://bugs.gentoo.org/654316
-
-From 5fefc65c306cf9ec492e7b422d6bb4842385afbc Mon Sep 17 00:00:00 2001
-From: Jay Kamat <jaygkamat@gmail.com>
-Date: Fri, 24 Aug 2018 11:11:57 -0700
-Subject: [PATCH 1/2] Fix error when TERM is unset or improperly set
-
----
- blessings/__init__.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/blessings/__init__.py b/blessings/__init__.py
-index 98b75c3..3872b5f 100644
---- a/third_party/python/blessings/blessings/__init__.py
-+++ b/third_party/python/blessings/blessings/__init__.py
-@@ -94,8 +94,13 @@ def __init__(self, kind=None, stream=None, force_styling=False):
-             # init sequences to the stream if it has a file descriptor, and
-             # send them to stdout as a fallback, since they have to go
-             # somewhere.
--            setupterm(kind or environ.get('TERM', 'unknown'),
--                      self._init_descriptor)
-+            try:
-+                setupterm(kind or environ.get('TERM', 'dumb') or 'dumb',
-+                          self._init_descriptor)
-+            except:
-+                # There was an error setting up the terminal, either curses is
-+                # not supported or TERM is incorrectly set. Fall back to dumb.
-+                self._does_styling = False
- 
-         self.stream = stream
- 
-
-From d885df78c6f931abf3259343aaaa897e16c8cba1 Mon Sep 17 00:00:00 2001
-From: Jay Kamat <jaygkamat@gmail.com>
-Date: Sat, 1 Sep 2018 13:20:32 -0700
-Subject: [PATCH 2/2] Explicitly catch curses.error
-
----
- blessings/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/blessings/__init__.py b/blessings/__init__.py
-index 3872b5f..fdceb09 100644
---- a/third_party/python/blessings/blessings/__init__.py
-+++ b/third_party/python/blessings/blessings/__init__.py
-@@ -97,7 +97,7 @@ def __init__(self, kind=None, stream=None, force_styling=False):
-             try:
-                 setupterm(kind or environ.get('TERM', 'dumb'),
-                           self._init_descriptor)
--            except:
-+            except curses.error:
-                 # There was an error setting up the terminal, either curses is
-                 # not supported or TERM is incorrectly set. Fall back to dumb.
-                 self._does_styling = False
-
-
---- a/python/mach/mach/logging.py
-+++ b/python/mach/mach/logging.py
-@@ -93,7 +93,7 @@
- 
-     def set_terminal(self, terminal):
-         self.terminal = terminal
--        self._sgr0 = blessings.tigetstr('sgr0') or '' if terminal and blessings else ''
-+        self._sgr0 = terminal.normal if terminal and blessings else ''
- 
-     def format(self, record):
-         f = record.msg.format(**record.params)
- 

diff --git a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch
deleted file mode 100644
index 6fbd13f..0000000
--- a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/666898
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
---- a/build/moz.configure/init.configure
-+++ b/build/moz.configure/init.configure
-@@ -572,17 +572,26 @@ option('--target', nargs=1,
- @imports(_from='__builtin__', _import='KeyError')
- @imports(_from='__builtin__', _import='ValueError')
- def split_triplet(triplet, allow_unknown=False):
-     # The standard triplet is defined as
-     #   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-     # There is also a quartet form:
-     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
--    cpu, manufacturer, os = triplet.split('-', 2)
-+    # Additionally, some may omit "unknown" when the manufacturer
-+    # is not specified and emit
-+    #   CPU_TYPE-OPERATING_SYSTEM
-+    parts = triplet.split('-', 2)
-+    if len(parts) == 3:
-+        cpu, _, os = parts
-+    elif len(parts) == 2:
-+        cpu, os = parts
-+    else:
-+        die("Unexpected triplet string: %s" % triplet)
- 
-     # Autoconf uses config.sub to validate and canonicalize those triplets,
-     # but the granularity of its results has never been satisfying to our
-     # use, so we've had our own, different, canonicalization. We've also
-     # historically not been very consistent with how we use the canonicalized
-     # values. Hopefully, this will help us make things better.
-     # The tests are inherited from our decades-old autoconf-based configure,
-     # which can probably be improved/cleaned up because they are based on a
-
-
-
-

diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1
deleted file mode 100644
index 97c5fd0..0000000
--- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1
+++ /dev/null
@@ -1,9 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors",   true);
-pref("intl.locale.matchOS", true);
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("mail.shell.checkDefaultClient", false);
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.autoDisableScopes", 0);

diff --git a/mail-client/thunderbird/thunderbird-60.8.0.ebuild b/mail-client/thunderbird/thunderbird-60.8.0.ebuild
deleted file mode 100644
index 7433210..0000000
--- a/mail-client/thunderbird/thunderbird-60.8.0.ebuild
+++ /dev/null
@@ -1,602 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHTB="thunderbird-60.0-patches-0"
-PATCHFF="firefox-60.6-patches-07"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
-	selinux startup-notification system-harfbuzz system-icu system-jpeg
-	system-libevent system-libvpx system-sqlite wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.36.7
-	>=dev-libs/nspr-4.19
-	>=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.34:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72
-	)
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-1.4.2:0=
-		>=media-gfx/graphite2-1.3.9-r1
-	)
-	system-icu? ( >=dev-libs/icu-59.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? (
-		>=media-libs/libvpx-1.5.0:0=[postproc]
-		<media-libs/libvpx-1.8:0=[postproc]
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	elibc_glibc? (
-		virtual/cargo
-		virtual/rust
-	)
-	elibc_musl? (
-		virtual/cargo
-		virtual/rust
-	)
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)"
-
-RDEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.9
-		)
-	)
-	selinux? (
-		sec-policy/selinux-mozilla
-		sec-policy/selinux-thunderbird
-	)"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-llvm_check_deps() {
-	if ! has_version "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patchset from firefox to thunderbird as well
-	rm -f   "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
-		"${WORKDIR}"/firefox/2005_ffmpeg4.patch \
-		"${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \
-		|| die
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Apply our Thunderbird patchset
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${WORKDIR}"/thunderbird
-
-	# NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual
-	# check on lightning version or changes:
-	#
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	#local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
-	#if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-	#	eqawarn "The version of lightning used for localization differs from the version"
-	#	eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-	#	eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	#fi
-
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Avoid auto-magic on linker
-	if use clang ; then
-		# This is upstream's default
-		mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-	elif tc-ld-is-gold ; then
-		mozconfig_annotate "linker is set to gold" --enable-linker=gold
-	else
-		mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]]; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	# Stylo is only broken on x86 builds
-	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Stylo is horribly broken on arm, renders GUI unusable
-	use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
-
-	if use clang ; then
-		# libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
-		mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
-	elif use arm ; then
-		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach build --verbose || die
-}
-
-src_install() {
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	cd "${S}" || die
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2020-03-01 23:03 Jory Pratt
  0 siblings, 0 replies; 10+ messages in thread
From: Jory Pratt @ 2020-03-01 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9e7ea5b76d2e951ce5e25e745869832412300522
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  1 23:03:19 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 23:03:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=9e7ea5b7

mail-client/thunderbird: Support libvpx-1.8.2

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 mail-client/thunderbird/Manifest                   | 109 ++++++-------
 .../files/thunderbird-68.2.2-rust-1.39+.patch      | 170 ---------------------
 ...-68.3.1.ebuild => thunderbird-68.5.0-r1.ebuild} |  17 ++-
 3 files changed, 68 insertions(+), 228 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b112f7a..e735889 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,57 +1,58 @@
+DIST 2013_update_libvpx_esr.patch 14356080 BLAKE2B e54473e9d70c7beb85762ceb39e02d8542e7b33c5f81ba4faab9a3762673fbe65868d2130ade3503f17c02c7890731748682e86aeb31369f6deca8ce9ee814eb SHA512 d8ca55023b22516461275f4be96e22d7c0a4acc299f23e2db5e15f1eec09e4f08a2e10d2b3d10c697219d70dba948751c5be5ec0ba6ef85122c419bfb805a472
 DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-68.3.1-ar.xpi 617167 BLAKE2B fffa85505d911f9863862e93250b3a16e5a54921774691587fd6447cef4278cc273ecf028bd4852992d6680a07f90ac17766427706f7d91303465a22d82fd8cd SHA512 ae0540082ec73799e73cedd855ab054ce2b1fab9e89b13ca45bbd2c5960143427921e5681da61cc6bf869ad1cc4cff27501c8e1f575e7c98dbb41e654cd2fab8
-DIST thunderbird-68.3.1-ast.xpi 551298 BLAKE2B 0ea77ad0eab79f2504d13696389dfa27297778abdab8ef2bd57311c61955a9114b77e1e2fc28350d6b9fcb6230d32ed0ffb9f19ed5661b4ae37cedf8913da623 SHA512 c93fa6319c58ccfb229e73781a0de7d050fb03d503e2ca91873680529c138ac404bc46850f32b549a6300d1b91ab809d7525fe5d3db20cd0d72bbf6bd163f9b8
-DIST thunderbird-68.3.1-be.xpi 646279 BLAKE2B 14beecf16085c661d31252e959c69bdea5eab9ddfb56d85dccdab28f57e2fe53830ee3deb4d3f48f38ae45f67403c7fc364feb67bf4c4d0b17f0f544ec720a01 SHA512 02000332fe0471b347023d130b30878806d7254dbe20b28f47e52245870db9ab23970fb9161c87c7e9143fb47720b6931ff2895f3261e89e5d3f65639b5700cf
-DIST thunderbird-68.3.1-bg.xpi 646227 BLAKE2B 327e7b4a7d70bdb062334ef53dcab9ed3615424aff74e46046c7666aa540992f00d3c01864036cb7ed9fc220357d18b927f01fbfed6ace8029e09a4fc34ebfb2 SHA512 4539a13495cd8eb5d7822322147f2db24a2a17bb5e0fd23629d27b3ea7e1fba55c005722ed77e4cb053df1cc6eac170a1ab99b4f44951cef1069bb7de8df5b73
-DIST thunderbird-68.3.1-br.xpi 574851 BLAKE2B e5c0ae2dec3c2b8515fc0c2011f68229eb77aced56d421271464f0b01fcd4692e6a368f26c9694b727713600ea496fe688c9e4c1831d6dd3dccc5f769885a357 SHA512 eb07e1374984553aa877f4c99eb460041d73b5d316a45a5f8f314c1166f2479b1d7a32baa1c4599bb635b47dffca47968367041ebdc109ada2d7708aeb593edb
-DIST thunderbird-68.3.1-ca.xpi 578438 BLAKE2B 9e448fa1a4431632a0e725f2b3df74af3f07b94a0eded49e1992479931fc43393c9a40c08a2431a403c049a5527bd88528debcb8e75b390c6f45d507ab7bd46a SHA512 53057eda4068d8572da349536a6245d241b690bfe6945d17e723e48b4b3e86c4258f4ee2a1ea734defef2b9a0fe67eea726368e12835de807877e7521d1d22dd
-DIST thunderbird-68.3.1-cs.xpi 603041 BLAKE2B 8f0ba016fff80a7fcc232c2ec43a7656b058e28e45f971640a92f46dd41e0e16116711801e0f42ec7821902e8d12418c55d25cc05ed0715faf694074ad4dcdee SHA512 51042694f774a9909dfac1ce1869850f0d0a0048326559d722a851d91aecf1955f09619da1dbc88ec0c938ffaa91ffae6727f7d32befa05b1b6a01897e6ebf03
-DIST thunderbird-68.3.1-cy.xpi 589902 BLAKE2B b125630ef47c7d67b705d38fc3f68af526ed3ca0588beb12010520cac4598fb4226fed40b70a0d050e9e6e22914a0a7e06837f47a352c5ba1952b6463be6b862 SHA512 d34a2aec8f9c31befdfad9aa44e04e28e8ff49803d74e305d64b9013a1df2e1e79f3da3709ee38bdc72eb7301eb28d723628c7a6fcf151ab937c30de11763974
-DIST thunderbird-68.3.1-da.xpi 588350 BLAKE2B 39c2f1108d53f6b24fee61f5f15335192b15633e0d6d4106634fe5dee6b8ab88155f648680ee7c0849b262696f74a59b5730594cbb4069086be3c9487c42673c SHA512 0a0f01a73918b63a88b872c4b3c975d711a559287b192f2ce1be41172328023b00b7655096f41522019e6d76d625b0a5453ab096c6f88465299c14d77158fa91
-DIST thunderbird-68.3.1-de.xpi 597801 BLAKE2B 30864a048e825cc824b83a27fa88c4146aa26c47586fdb0f8e90900e47915edc54ab67da8f632fcd1b461d9d3accd0b69b8515e9889f992cf75fb7783c2006b3 SHA512 fb94fafa63087166a538e82734fff444d6f54390d2f38e74abd3f090cadc426f503d98e5755b1dad83e37a3d2dba49847b10faf19956befb951abfb8bb08c104
-DIST thunderbird-68.3.1-el.xpi 699222 BLAKE2B 2c1e2e386c4ed48e261104e16aa0359bfafcaa4d46861332e04d2089226b9fc142275a9f5ce1ed530bff5ce893d2a230133e67afc008299ce63afef7f0d332ba SHA512 542f73e33c7a3f39e982d0b67a4e6dcb8ee851eae5f03b75875f1b79c55851ce67d00bc3f0f1c0d36c0a9856a29e94e3556de091e8aefb32f5ebc7900e98c814
-DIST thunderbird-68.3.1-en-GB.xpi 556403 BLAKE2B 72a4677fc59704de4b79181a79718b277d47718ee3a5ffe2e5af8ef69bbeb8a71f517e47a7b9ce18f291d92b71e6770e2e4410e738a8fcd4bff4bb6217e8922e SHA512 ee4ab262bb960969e19d73bcb47b9f569d9ddb4314145573ba34c3a34f744e06b9f0bb54a9529b4b0b06ac85b1e4f5599dff495649a29e5f49a2d4ea0cde2ca8
-DIST thunderbird-68.3.1-es-AR.xpi 596551 BLAKE2B ccd9027cd578eb11cde175151cdf0e8eece6d3f4faf73e84dd69c5ffc844534f413ca1d8d2198d7cbef6a68e10ded4f30a5077c75e3a78cf769253bcc4ef4a57 SHA512 dc4fdac2ee61b0514e18140c3cae1170fe63a495a984b54e356a402ebac5f50853a67208d64883597863bf03b4445e528b4a8c622b0f24a8fb5e23617a35052a
-DIST thunderbird-68.3.1-es-ES.xpi 518351 BLAKE2B 6434495c30d986695c72e25df8a78246adfb60ff6cd2c4b7d2df1bf421e5837c23ba04fd67f2bbb44bb46a76734b5e656036e9fed75a64cf22db7de65ddc383b SHA512 668d8720b91e3f088377835b445850820ecddb46eadfc7e325de400c6424bd30dcdd08c35c9056551293bd23f400c23c14dad165b256f21fea3295fce9bf8166
-DIST thunderbird-68.3.1-et.xpi 573581 BLAKE2B 326c80e9407d8e6a4ee63f460219d2431284913b9ea7fa4547e7f667a3b9b29576c5aaed7f789d9d4282012f9f6768b26f7f916745c63c4048d20900f2596947 SHA512 02cfab746872cf03aff0d32202fe55d7f1252554337e5e8189edaf2b3e49e4a91eb9139915fcf991281fe6da79ffa7a83f48d06a822850222c506336f53b9b7c
-DIST thunderbird-68.3.1-eu.xpi 579945 BLAKE2B 770329b3f6a1be9f3380d72c58cb725b6bd1324ceeadd6b004da668d2e61c51c024b2d3ea98dac1faacb0bb94dd74355ca6f4f4b8c1c761bff19bdc884e6d55b SHA512 5a4713a42218940c12163cd1d83ece756cb3dc26ba265b32935e53581494ff31b15886d036970a371a4cadf0b4414904164f1859ca166e0ad5c8c656b4b1d7ef
-DIST thunderbird-68.3.1-fi.xpi 578418 BLAKE2B 4f2d15165e247032c0c16d80f072c700c63fa65d17f4d329dedf8db62bab87ef89831c892f1505e20dffdd3a82267e985e8ee59589f3f6c53a681d319d55c281 SHA512 f410db97997f8ced27dd7701788d58130f2e7875356e6140603c3a9f2969b86e3b9294cda1c85fc10655a21cc457252b3be855d342c064571e242e28a44e5a39
-DIST thunderbird-68.3.1-fr.xpi 607810 BLAKE2B ea94ebf2ae7d9ef29a2292e0a4f6828b68cb648916d0e948e049e6f65b52b7775a7d3139627b39ea641d4ee24f77cb6697ed81c24af5c81c998de93dd9959abe SHA512 9bb2fdcada34b5135ec7702acb1dd9330346f8b0f955465cfc3ad5c41028f29c4d756b80453c791bdbe0354ca96abc1591be4cc194c17ff7b55d5e1c4ee43e76
-DIST thunderbird-68.3.1-fy-NL.xpi 594466 BLAKE2B b692fd90fe51b39dd4c9210097f54fa14312bb3daef65353f3de2a19153bc244a2713bb3c535f9fa0b0d34ec0940ef256f4615ae23e9efb3d3405c800c02ffcd SHA512 07fb7ecd722c1760a55c7955389b169ba4af8d7160cc7b94fb1c0c19f80a99f8e8721030ce59fbaff4d28db7f1c7b9a16c78481e6dfde5aa7b427e06b794b060
-DIST thunderbird-68.3.1-ga-IE.xpi 588709 BLAKE2B d2056e75ab9b87c9676a8dc24d85bcac6fada12d37e04bcefb228844bff5d1b972c1505aec4e6d59c5b17bfc717878fe78c011fec3a534a818cd7f1341a99105 SHA512 16d9a60e2fbb27bfb44822abcac8e7f5fd7890bb54b171ffc978ea0e77ee625b4a15f05334bec623e6c804323d8de22a6271c2d7a38052a00e0f56e732a2dd49
-DIST thunderbird-68.3.1-gd.xpi 587109 BLAKE2B eafe1f9cb3237cdfe11e0c4802c8b623425ba7f3ab7b7910e6fd49f341ca51bb37c5513be9f4bf6a7d54c11d73888245037eaf3d369f3127ec73f696db6e88fd SHA512 efb3efcea9dde6ec6dbcfadedb38d953a07b0796b27b8698bd6e02d59f5a18cdfacbfeba90fbe8547dd03a68eb32083253d1f7969927699a969985dd4caaea09
-DIST thunderbird-68.3.1-gl.xpi 568396 BLAKE2B 2f53eeee533210d5173cc2bfe682cc30f298de5e685bc9afb05e4c2eee5956c9782422900479976f3103de4bd321dc26467ed1934923b4f808f634b475981dd2 SHA512 fb22509b22618e946d289a0831efb3a7fd313ab42514909f4def5859ffafdfd99f5ab6df1971b18e0926a3b4b9e840475fd0c7d1863d11a28b178af02c27615f
-DIST thunderbird-68.3.1-he.xpi 604787 BLAKE2B 4447844090d31b9a19d2073704e1e4cd402d5fa7e55eac7294fa2310cbb585bf053886e9a46e43f7ab709d3059e79880bd30ca9e10984969995ac0b08a5e4f73 SHA512 1d26607ec07491d9ca828eecfdbbae3f76c952d582eaaf7fac3d80520a80103db2e6508b20accf1793012c08d240590627f4ae2adff7b45f7887824897ea2556
-DIST thunderbird-68.3.1-hr.xpi 583783 BLAKE2B 4c7006079628d8d28f560e582bb577e41bae1bae4c320526ae66285178aa528b03b11fdb24e7899bf69ca8c695dbf751f00ac7c296002ad10f8f4e7f79d40104 SHA512 1259eeba52bd1866d65730fe9a0648d95b01328587554204ddf32a5e964aa37eff6375122f4658b9a70507652988800c9bfecf8b773ccda7d5354acd6b8b07d8
-DIST thunderbird-68.3.1-hsb.xpi 616036 BLAKE2B 4dd43fbc7b77cee0a0d0bee8cc063e8d780b608752868878ff98cb36f6501c2a134967a7a22ca3a0c86de2806973c72e447ff02a3dcea99488c26d5eba1368cb SHA512 a1bf7e850efcb2c3ecdecb6c4bcca2764a427112f6cb5d75f101204e34747390cff8227a3b41c80dc0f2f98b6f3c9ce2941169eea6cd69d8eca83d93e130f9cd
-DIST thunderbird-68.3.1-hu.xpi 618153 BLAKE2B 4aa0ce38f9659afd00b07efe28c58e438fde3b2e3581f633ea3724f9a572d21a51076d18e786cd39c0fc8ecf9d1375b702a35c1369f4a16cf0185f1f8a0b70c6 SHA512 26aae5b9fe2bd626039edac18fabf381370b962854c9d6dae4bc083bb04032ae54bbffc1ce6074521512beed9763b0fddf8ccf189caffb8e652b876cb3ac392c
-DIST thunderbird-68.3.1-hy-AM.xpi 631976 BLAKE2B a51d53e0d0ab64db25fad7f9e2c608584a6900329959f115d361fab3b01f826590d264f242ac1189be0e8c733297fe99ab580508c6a45ce60d3120061d71c6a8 SHA512 5b9dcb2e4894e4c858c5df4bfbcd9073b91887b49fab13b0e793f0d2f523c62bef4892d9e977109c8957da01b17ef6efc2c87abb61c4cc29f8f8bf5a8921a5a3
-DIST thunderbird-68.3.1-id.xpi 567745 BLAKE2B a886b60a954c85d73cb3edb0dec87f67b9ba95a970a59f08747f6aea62b618e8a491c0293711d4ba43484cebc791b6b77ec40f07284359976cd4494dc745619a SHA512 1ec7f1f367a1552561fa2e176bea6ed5597b3565ff839b80d50a07084e2ec64dbc4d58ff75611f41a86507a9b01d7144992dd75fbaf5248a10f5253126769b79
-DIST thunderbird-68.3.1-is.xpi 575441 BLAKE2B 73ac92632cd67766e1bc242ed7489e965fba4d9fe72630135e1a001022994a1db892138672950761972c32a99df884e9cce494b6cab7ca8805b02cabcdfc5be4 SHA512 251b79e495124a81c69d779684734ac9970a178564e53215c7daca9673381995b8598f85569cf1e984594d741786ea6905da7223feca22ba7d9805ad3e422a86
-DIST thunderbird-68.3.1-it.xpi 489519 BLAKE2B 918bd9e7f07cf75000fb54866ccd4acab85045302289ff6be48ddaab61a9e87233a02c5ef82d303e552a6e6a20600a062d654fab8be774c1d2701c2b935ebcb2 SHA512 160e8b7111c850d4908d370a77aed4f6d389253c049a626f59400cd3b7196c9f6142685cf670acdf8cbfce06b658699e3ce65e7626fbabe5297c47801f722c43
-DIST thunderbird-68.3.1-ja.xpi 643575 BLAKE2B cce38e0709ae522e9645fa2cefefbf621f23569c65a5cdeeb820401ec1da2c5c2a7318d7414cc91a42d0163d8a96b48f082dccd26dc9a16354dc18a6d3e1a1d1 SHA512 517fbf1e7fc609e345d396181913c1dc15aeff59c1165f014ba7027b7233e9bb1463a16a83fc110b9131f7002fce7026dc3d7716bd1e3ed3821a3d83dc44c5a9
-DIST thunderbird-68.3.1-ko.xpi 620527 BLAKE2B 3a0f8e33d5a872b2a9b1511e34fa375b0c6e4bd0bfde385fcc589989be8bab859cf835ab4e57b89e95ce90908ce4b390bbc7ce0dfac8a18275a60eaef188ccef SHA512 a237328f6a8053e27af31cbf71300493b3482b08630f20663f4f6d4ccc2c5142928b2e02c2d9136f863a476309a95a142db2d2097d8b6606df2a168500889fb0
-DIST thunderbird-68.3.1-lt.xpi 603845 BLAKE2B a6bed563e8857e681506fb17a1b169c4f98c68a2567f576636448f160966e048f4e9f999dabb19bffb4e394570610424b7489a7cd2eea3059c9d7c6e1357a5b3 SHA512 0a3445adb168bc45e78b1655d6937970b2666767924e56fcdbb537da9dfe289dfdf281e54d88aa7656b1543fe4f5efd490d3fb8587b541d2f43d372d08fe820a
-DIST thunderbird-68.3.1-nb-NO.xpi 574020 BLAKE2B a05265acd67f607f4690f6699cf4525c6bb99e154fd0120f03892b4e7f04da95e1c92d848a06cd4b8713f3141a7fddc280d226bfef8e3a2aefc6e587efcdd5d7 SHA512 d810add1c8ea53641a7749571344499676111184a5c33440acdcd4ace589a63a109a01c6962cfb5f0a5e00b766a9a37cf3eac3b7db9088bbc6b715b953f35bb2
-DIST thunderbird-68.3.1-nl.xpi 581354 BLAKE2B 41dd90a0a6b4d2d3e430ae3f61ab7c8927eb37c2d4a4feb375f0c19deb825d31d93f556306c6509d24e4d8a928f4b57ef7b9d10efdb9a3a42ed8204b24ca9f23 SHA512 d2b372de686ea90b7152b2e65359c1d4c3578ccbfd1c393fb5efab182d231283a17de0643db761327270329b1551918810719a786db9aea8577127210e6b3c82
-DIST thunderbird-68.3.1-nn-NO.xpi 574948 BLAKE2B 5bc523164c2609f869da86f61ca03d9a068d83199ecf5eea9d50288ed53d379fb8f1ff096afa441ae4c494be0f62e5478486e2f9fc64ea2de9fd73a01a97d9bb SHA512 3de15eb90afcf1da756b042324d40f4a2361d45152b4ed59af15fd967eae098e6a69e9ac9712c9bd89e733fc569043b1fb73f2b977386f3ccf8c3b5a325358bd
-DIST thunderbird-68.3.1-pl.xpi 576085 BLAKE2B 64973a65544ed8695e938bea8d2714e81cbf92b0bf77cc0ab80e9a162fb700880b96aec08c928b4b507f91d31d9fdbab945209d85205e0b2a6267b94339bf771 SHA512 82586fec065f032fbf9e9a43372209c178ba98de164de8f9997295778a30a177925551ad873816168e49ac79832adf68e7a5c1ec712afe80268a8a33302bb5b9
-DIST thunderbird-68.3.1-pt-BR.xpi 589836 BLAKE2B f1a713515d019186294dac002fd9d05c0fdd095a925c51eefd6d13eb4bbfeddce76d9ed7e04698d63c6b4708a7733db518a052cc2beca75735bb2ea10dedf868 SHA512 eeb4ca95feae849751697a24a23c89ef3c42f1b785114a6b1dc5658ea074ee3eadd04f535eeba5ea3b059abd3035e400f6239d1260006fb71c3548d0c788bae0
-DIST thunderbird-68.3.1-pt-PT.xpi 588100 BLAKE2B f508d82b3fcbd3bd50fb31e044c79e34d0c2ab1715990d36ce95c5db434a384aad6023bbad31fa06f0c6cc653cb646d2507ec88f2e8a81a97e9bccb3ca260125 SHA512 d190f4a7ba3e1959d894c8d4a3125802d036f266775668e2ea6dbcc609dd0e254138fb9f79e2abb5a3555ff82815e41b8c631c8ea39bf964ff0d74c30f573d43
-DIST thunderbird-68.3.1-rm.xpi 578050 BLAKE2B 05a0ce154c34105a356dcf7145bc6983d55313489c2183c7cdf5946ca00850be78e0b1125c17fe3abc6dfd6923509dfce3afc00390d4430b4fa0bdbd149df726 SHA512 b21cc8d77eb36ef21e896770768ac6f3073298271e932b7c3050bd0f57c31954ea9832a01d73263166d5670f8b31b5e34a0414c218e4df80c6a9a2f17f601e8e
-DIST thunderbird-68.3.1-ro.xpi 594840 BLAKE2B b33adcb45c1bd2fe659c59c6a0ff2a8b458b1a1c077ba77303cb91dae381abc5135edbbdf41dd95a58c78d4207cfddb444f98b819a1c5b03faf14feb48506a03 SHA512 4e1feac588928773dced285844d347c77f7ac32b07059f2828e777ff42b8e9d2e02a3357a6453adf71989203893c323b96182848712bc7c8d02722f1fe87edd8
-DIST thunderbird-68.3.1-ru.xpi 683325 BLAKE2B 5587b5e129cf7d58961253fc4736231fe7d44e4d428964d57e0fb94b5c33fbe885b82d83016c5abeecc1f7496e89e7fac4b25f88baf0305930de87dbfc7419a4 SHA512 eb2fa165289fcb8e16ec45e5e4bb9ae45c887a8af3dd7d7b3f45db9e91754e21fb27c547f355bab7c51d1aa9b357f735c52f1cbb6dae6ee1227311aa499e53a1
-DIST thunderbird-68.3.1-si.xpi 637404 BLAKE2B ed2605a79d28703389081bc71b8ef1e8008bfd3d08ad15b85cb9b77ec7cfeec6bb912da21572d7b8072b1c482e173e5359a4d04e1ba4a91fe24d3ad0d23f5857 SHA512 e96234a7e8863704f2e8bc1695e4e89ac8fc0f362d4c99e064a1a1aa96a243ca56386db46f349ac865768379984147dbee75524af21e27b9f950aca41977589a
-DIST thunderbird-68.3.1-sk.xpi 609752 BLAKE2B 238e18166b807c0dd0d0fef655fa8c51645b6b37355c8aa8aac7acd26ef40bd2c43199b18ccb7f03dff91a66ea6b40674cc4577afa3a37f7eebfbf486a81115a SHA512 5cde418609787f781f9d66e57cc8f43e3a20e5fc9ca77faf15944170b078a0d5c8e2417413e6a88d122c021e752eb2df98281282996783c1779a0be057505c4a
-DIST thunderbird-68.3.1-sl.xpi 590629 BLAKE2B a306935f2ed671279d7adf623b21f6b4310041c6b80792f2034d71450aab82b250e34e799a7c1483df0b65a73c0df23d289a660ef7e9c7d237f42a9a5269bcf1 SHA512 cdf28f1e94ba77258d89d6aaf9a8474ef60a70dbf7865f3ea68670d7d962d8431f4e01a0a713e93c3bb77e691a2667579b35ca2ec12b2fc1c06c5b22d661ab6b
-DIST thunderbird-68.3.1-sq.xpi 598900 BLAKE2B 2ceb841a2eecfbc4909e18a54515f595a96485d68dd54e96efbdc3366dc820ad8d6c68137ddd11014496b39304bd23e966fc9c247ca993faa071f09aa268076f SHA512 a4918f7ac008526841c4d957b1d3671ca7558889b8b9e054b9512ed04024e93463a4a2bdb3215ecd945fae0f128d89fb10a136baac16c6e92086cab61c9915bd
-DIST thunderbird-68.3.1-sr.xpi 624895 BLAKE2B 3f02436499496eebddb52620efa4a0dc9b0a8287a414f84e0843ef2f2d4454988ba510148bffba5c56d312251a708145e7c43e238d55ced91c4718ea6cf8d211 SHA512 e3b3216f531792dcd8c034d0e5675e5d9cfc865b5f130fbabe227b0aead4c6221c94011ec9bf91190d5bacbc00936efc51b1dee11db44060138cd16c9ec13e1d
-DIST thunderbird-68.3.1-sv-SE.xpi 591593 BLAKE2B 2d2f74c101c4dde66c9c03d720a76f60ab7fbd228bc75134d5afb3e8ae29b67846408fd1582a0404c28fbb0e109be2d31ec827601323927784dd37a187bdd42f SHA512 24f44c35d21815870be3971f0c77a886699eb8d7f98f40e18c00d675a086723296c44781a9d6797e560ae98c8b0984f9788b8a08e69dd31a6a7c97cab5b279f5
-DIST thunderbird-68.3.1-tr.xpi 599706 BLAKE2B eff66d67870a9b217ca8caa725432a9238a79845e71e2d66e66fc8e8a46d8ee5394b03f60387c6233b9122d9dc8ac6ad868a648c5d0392379acf10657adf4e07 SHA512 817fa66f5dbb59e358a8b61f96be00a43863f77c68ae62a0a2ca5b777a6f3e74c7d66cb0ad26564e8e9dce20fbaaf553f38c2d4792dd1e2b21469cb5f6aa4a91
-DIST thunderbird-68.3.1-uk.xpi 671453 BLAKE2B 0abe55012afd57bcf03564b3002100a464362aeff3b39417b67c9e9fa19330d11c22cedb78ec35300e0b4e8d522a164be7fa8d8f1e854761d4ae54c58a9ff0cb SHA512 cad22417ec43a340b36293421741892bbf2321b3b53191eaed1a90bb6c38cff2558399971565520542eb8e1a1f7bd9e3369210c35af780abf979fcb7f15cf63b
-DIST thunderbird-68.3.1-vi.xpi 623421 BLAKE2B 02372e88860749c761fdf760733000dab447c338324071c5f6fe3cc00f4b3abf2483e4a00632a3c457304f9b38f49c7aa4a6b2ce62ddfcf3230b75cea74731b7 SHA512 5f052a01b83291fa5c045e1a8d122e3645e8be7a307c83b73a40f68731066d8a5b6ae0b82e0591bcee1c905afee99dc0eff6a38af7f3ce10e20b446114eb704f
-DIST thunderbird-68.3.1-zh-CN.xpi 626818 BLAKE2B 8ae5ef94f82197ec4e494817217ce3a12c22ea6177f91a8b11cb7b11d025ad5343003f367fc0f7590e2274f6fe78b492a5f17f70bd28723bbfeacd818d83cf71 SHA512 bf12406a4a170d7503dc8d2bffb8c7c57c6e110428398f175c0095ec36aac30f6f0b208543fddabbd9d7891751e1fa5c9b136e98a73fa2d13f7258126ef3dbbd
-DIST thunderbird-68.3.1-zh-TW.xpi 627473 BLAKE2B 6639239c7029e485ee64c3c9f8c2cd9d0b145a872c333fbe4b22a17a4ee8987e2164faad7d6d4524ba267528255806f88490e2972420b6a39332468560e162d1 SHA512 a17d91846945a5672d452f2220e96fd23957ae0f938d2c7b647d90dd8ce3940935384ec872f2c8104d21e5908d22bc618baa526d19b6602304bb63b5f05248ca
-DIST thunderbird-68.3.1.source.tar.xz 338866820 BLAKE2B dba2fc92a242e2c02b8f0d473b0b4425ded1ca614e6759bd6ba05137c0fc16150b99c9128613b9f0c7d93adeba36d8c70de927191a81fd3f94477658413aac20 SHA512 2e24556e6bed7a8d75ad56f0e94e07483e021b8b1ddafcf0dc586c17c93ba1f6994194866a37b7fe23637804c351f0c24d365d39f327f0ee591a86b9560bbb03
+DIST thunderbird-68.5.0-ar.xpi 617166 BLAKE2B 5091401f6b38f29c4111a6116137dbf50659be5678475a603651facc4bce86bb528823b5946df804a13565a23391fba9c945a76c57e9e5eb0bd3908789789244 SHA512 98bc51f8fc9f05468bead19c756a2a2e762e8116da3e5220c3fd199eab03102f0ce48a1360775887e3b74362d5943c784012aab79fc7ea6249cfafb3196f70c0
+DIST thunderbird-68.5.0-ast.xpi 551297 BLAKE2B 90d90199a994d028f1b828a19799090965e86ce07e155ebc8da2d3a47c537c5413d3cd1fa7b3d0656136ced575b22e45f7c6e508029211326b001968b3535534 SHA512 c040de577a16a62a8e5df2d8df852221c766e4269f23c38431a1ca841fc308d5cb42e26cfb16a70c08e21fc433b8ee2f1ad3fd858b87c7db844330c9d99296ce
+DIST thunderbird-68.5.0-be.xpi 646279 BLAKE2B 4e6ddca8b65711ca3f74658e0c1d1f36b4f0ffea7de9da54b4fbacde5595610287963bcd1bb6fd0417237cc370e32bb49f249e37a79ce55c46494517b4d343d8 SHA512 f6df4a046790d587bee2f2e67b30fb09b837277b12ffaae1c0ee77f7e208f2a4782a761bd2318f60feb1f25945a7c375fc9e56a92ca8c777ed6a36264bfc71de
+DIST thunderbird-68.5.0-bg.xpi 646225 BLAKE2B 08bab9924287764f8c65287d9ac2f2fae51ba825d6e8b48c0dc91789cedc2e0f84c18a258d2995b5ce168dcb4836eafc72b2557e71b95841ef8c5ff57432c336 SHA512 a2a90695551a1812ca9f02ee48523002a8c5569df20e30002a9f0a9ae229c24ef15986058eeecf00b803b58514ac0834e22e7b50fc4655a56f33ea29fe4dc9a4
+DIST thunderbird-68.5.0-br.xpi 574850 BLAKE2B 75dda1232edd56ea5712d5dbe161895124d178fbd6b23a9d3e3af07575a871731b980ee08df46732b78a7b912954f57579b8aa80c37541c7fba1d160d365a6e5 SHA512 d70684f4411064a8560ef950b70a55de8f620ebbe6eefe2ceb080b85fd197aac6e634eee03c83fd38e4cfa85259436d450034e69ccd5a2fe21e68cc5a187e3c3
+DIST thunderbird-68.5.0-ca.xpi 578438 BLAKE2B e7a1e228d8b31f2d387659afeeb767e34ddf9af4d395a5a1fe053a7f82f8120164c455a2f6a1fe40d00273b83f369efc438ddd39fc2d5572604c142984bf0c4e SHA512 c33c5b00cefb512794fbbdbe5cbe33332e2f1c1e7cfa882ed6234b38f1a2ffacc612ad0503bee80f639f1adae5d09a6fe07d11a2cca733f9b94430b9ea8eaef0
+DIST thunderbird-68.5.0-cs.xpi 603041 BLAKE2B 3c0fa28d4ebf2238efe6d533ec59e72c3d232a0edfacb3f06f6cd0c5461d7bf3bd26c3e65efcec6cef363cfaef2b10e3599cd3ace5b38391f69cc5bd9c3c947d SHA512 685e01f7b3a391e5c0717cf0a5557dddc31300289ed108df85092fd093cffd09142f033f07ad0f0758e61f6fe899bb100ec81e166c5f71161e293f8dea10581d
+DIST thunderbird-68.5.0-cy.xpi 589901 BLAKE2B a57d654cbc6c1fb724670529f26f85ac40f48563bbe23400e535beb175ed662d97c7ff950a321e34d18ece6ab8295d170ff30c9ed8732381e4991c67e647f71f SHA512 59c7ed83f1ad02d67f7b955165b9e320498acd3f044522ab71df7475dadb4f4a87146b35fd4d714a104ccb5a7fcffff8daef2cd11f55b77c89cb831e255af0d4
+DIST thunderbird-68.5.0-da.xpi 588349 BLAKE2B dfd9daa139e1bbd9aa18bbd8879fb10db75e1f194b7d427dfaaa30ed5d07c44552c05fb52f69ef8e7cee8fcb56ba9e834f7619753963117dbe2d6b9561417c53 SHA512 d33c09026879288a2c0c9cb7ddab7948d7c1bf320259ebb2681a6ca38152243d514bb0cecdec6955b4c550568cd15ac48c56e92208cdc25f7f64e700740500ab
+DIST thunderbird-68.5.0-de.xpi 597803 BLAKE2B 6a2c7d0f654dfb04a3bc1624da134c01e6854b7ba952be9774a398db6dc559104caf6ca9d0bf12fe43a1192255c1833b36123bf098d3c0338668a6129d3cb969 SHA512 53ce926239217989b32fbea88cb7d0bb07f55e7233a9ebf2ea6176d8162f4d96118cc6dd786c393608e170bf3ab08fd44eb6e2426c9ac124798ca3d37cc9cf40
+DIST thunderbird-68.5.0-el.xpi 699221 BLAKE2B 8db0bab0d0472d6888f65be7af5a3c499c059fe9ba00d905440bb9bda87a7539ced304dd78d4dd616ba2c3a43dad9cfbeadcba2707e4e51f75d7e77220f42304 SHA512 a1767cfd4ad7e2574755e865a70f6aa89b1308d2c9c38442c7c61df823b62e2c373e1d8308d8f5ecabb98aafe4ebfcdabce67191738580641f93b015824a4387
+DIST thunderbird-68.5.0-en-GB.xpi 556402 BLAKE2B 960b8058e539972ae970de7f69fab1a2a005827c686a5f2949ead40d9275eeb230f451a93b7a0efd7fe1335a8e0d92bc68b9c8de11bd77e2f7050d598db355f0 SHA512 77b3721b06fcf6b53956e40da8c5eec75d22396d2714d75815668fe59ce27fc47995cc68a222c6a9b6392d32ec48ced0bc24a75ce7dccd1ef446a32dd7bf21d6
+DIST thunderbird-68.5.0-es-AR.xpi 596550 BLAKE2B b7524d3673f11644e8abc182e2d69f8e4c1c93b16d3c28e17325a3461f12c36f45a241bed94fcac161ac2e700328e5b3bc1f2107478dc3ad27d5715debd5769c SHA512 6ee9116cf523fa9d7994bdc9869623be54c4cb29222d5646c9dcf2cf0d7c88765e0830c14c2202f717fb3350b049fb4ce5dad25db8fa458064baa0df08053eda
+DIST thunderbird-68.5.0-es-ES.xpi 518350 BLAKE2B c92736208cbf0b6218c0601d72904150abe9253e5f0e3701539ca8620da02c4f13537bc143b084e7f2de94a7b28e30c4c295b7cd38470469134f34fd398ed94a SHA512 3662add93dd634cdbe838ae530c714fe1d670e8fe1dcf7d2dce02f6bf6dd24243e08460558a378b9c091e03b3797b97497604370750b5baf33d52d268b2c903a
+DIST thunderbird-68.5.0-et.xpi 573580 BLAKE2B 07a6b65516d4f57eccd236111c4a8782fa32f8570d94a2b043275e883ec1bf43c7879643174a35125ff8c444084c06ebe7356f1852eb0a7770d271a66a3cc6c8 SHA512 88e04af5e45f1a68dc3b7425dc0f52c2584578b24c44637476b7f1e4298850349c021c7364cc99210fac6f163131d0408a14016d87365be9f91af8297e9c4cc2
+DIST thunderbird-68.5.0-eu.xpi 579942 BLAKE2B f69fef21abb74603f7a35b208424a5486d0ea1c3c98e2b338d6ca21e892e05e8021b39ce246b8af158fea3828abc04e3b2ef28d4bf926787c67a1a6bfb29af10 SHA512 96aeeb8deca4eace8d2e5ff7e4a7aaef496c5ef96e106e2b3b48786a6175d6a87afd347ca2f9ffad9b03916f1973690dcff78da02a2203dd34de3aef0ec3c3b6
+DIST thunderbird-68.5.0-fi.xpi 578416 BLAKE2B bd1cf13d1e28f1a5eb937cc211de1bc0654c7fe8fd3b6e0b119fba99715f4d1d36e6f4f4eacd402749d0acf42e8608e35c6b054add33b28204b8cedb01dae93f SHA512 1b9e33721101ba0d1601080a860914a4da0fb0fe927fac759c2687e4ad3b9444c267c4d319ffffcd8b11490d60f2d1b644eb1480b88bd8f2918e33ea267bc819
+DIST thunderbird-68.5.0-fr.xpi 607808 BLAKE2B 01fca025f087f5cddeafd558d5f0743691b46109eba534bed750d6cbf25c209795f12c503d7ec4d407f956e556745cfca062bff641de58fd7c42c69815821f9b SHA512 ae854890fc0a5ee8ab6e18fbfcee747e2b18dbfd18b323753f0d50f159b6f1e6577e486edfdf5125047c5426a77c04fecab347f4706102a3438c7f72a9b4bd3c
+DIST thunderbird-68.5.0-fy-NL.xpi 594465 BLAKE2B 09f33e6d0e3048b47998de31cdc3d386569e5b812dd6eb18ef434d52cc51f490e39141333d19843c71313cc562090749866fc3924b61a33749fce135f3170baa SHA512 2a11db9c142c6611a60fb522788e4f5c30485a75217b53a988b874c893444ae240b2f7864183a53c28018906e410eb78f322b27866b130093ba1c28f527a5832
+DIST thunderbird-68.5.0-ga-IE.xpi 588708 BLAKE2B 2acd9be11f29566a4990da4c5777f71d24dec68b9278bbb83cce7c696764ff100c95ec62e193ef5feb2c6b54df44e9a464fb582a808733b18d8692ada5f94f8e SHA512 d66c0cf0ac8a46e896c58b6141a29a4645ad066c6fbc4e4b2ae8798708977954db365a622740d2209588d6be09696650a125ff1b00093889a0b1b76a51f6215a
+DIST thunderbird-68.5.0-gd.xpi 587108 BLAKE2B 822a3e65748fa66deb70b17514780416351d5c590ca7eaa40dc8c6be3a0186578a90157c8d4c978b6e91951907ebe0dc5f932235d35094b42dea9eb7c39265a3 SHA512 8ef7173356bf1e4a570371c053dce13c6ed5e9295745b5f0bd088ebcad8f3d20a48ff0d313d8905566233e51c3f88bd460587ac468dc86d19c917657f418e475
+DIST thunderbird-68.5.0-gl.xpi 568395 BLAKE2B db563460490761a35a54f5cce9e727d179abce0c1e007694f85a323d512c6e52951fec3d39626cbd2809d4783a3862e589bc768a6c5b3c9c64863e8d10a3d42e SHA512 eb2c88002aa3d3a4e22739bbcd0c83c7ef2bdda13198a2f4587455d37a5e61a28e49e43d3cdb50c60ba2e97959b109b36bb4e66f0efe745f3373a21b89be592f
+DIST thunderbird-68.5.0-he.xpi 604785 BLAKE2B f50dc349829f604323bda7ae1caf2b7cddff398b03a8f7021df719f9f8739ecc2d092b33656b876993b605e346bbfeb9b4b877c19e44f34431ad5cc453162b91 SHA512 b79b23fdaeed4a3f91786b0a33b3691986400399d8871b1ac0a59d5a68596b2198382f320713ed303169c02ba11d066e1f6d760f488cf4f142bd880dc5f5f30e
+DIST thunderbird-68.5.0-hr.xpi 583781 BLAKE2B 05e6d5b44f61db73550f00d259eeaf8334be689ec85de29ef915876b99e80db85a37a6ff9289e119376136d9117563ee7b20dd36fb7bf6622ffeb535efc9ca75 SHA512 c0dc68b15166d3aa1d0bca44e2c455fa5442e45d4dd14d4a8a7e822f2bb3c97e21d1890734d108b6cf51a4a622910d3d6e7c792ca30ea307e5ffcc709d41a479
+DIST thunderbird-68.5.0-hsb.xpi 616034 BLAKE2B 0d781ae99fa39cf67087c411ded0b9e79a67e8918d28aea86f7fdda067b38f9ba00fde5a34e6c85ebc7586da4be5a2fd67af23c229eac0385e6c341a35446345 SHA512 a73f587a57634eb0258ff5f5abc4313adbe0bf114b7f64620f060662e18958f4b5a0afe967aa69017019e803fd29c01e97500b4721927ace5b514e7ebc7b1e33
+DIST thunderbird-68.5.0-hu.xpi 618151 BLAKE2B 51f30532118c62fe2195827c3e026edab2567bb5100eeab37982376df170eeda422a0f3f2784a43296e6108d05ec62d140ecd2ef2890be779c9d38730d0dab7f SHA512 ff8eb6087e02334e5e7208b20c76e495a90df11f69f3f934f6d2f0dbe23005a8e1ea197718b83c947cb2c6392f65e847d825843e5fbc50c678228131181f7f19
+DIST thunderbird-68.5.0-hy-AM.xpi 631977 BLAKE2B bd998047a56750f3b03645d2ae3e8c031253bb71611f8985e9b85cabd93cd74846c370b4200f387e7de2c3ddad4f8fe73227da306bc2fe20c2c1aec19b79cb96 SHA512 cb063678b784b2c14bc4935af93923d3576e837bbb0464561bb48c6e3ba1d033bd0116174b31ed5af7ba7650441a497b74f32212d456c55e542e7963b875b9a9
+DIST thunderbird-68.5.0-id.xpi 567745 BLAKE2B b790db974313c0f36cf352f0c417a5fd42bac93f0da372f669caa24476bcaaf51d714a0bae3ab34973cbd52f2a4d218395f7bc55100497bb08c31f2ad4443c1e SHA512 4c122a0b70bfa02adf2e895fe51d3875e7fab569e025203938d1fa871055da848c860d36112e189272cc95f0d1a0d3709ffb13bd8ad95646a15902190cbe364e
+DIST thunderbird-68.5.0-is.xpi 575438 BLAKE2B 0b0f2634fa5e2f0d0e05cf7815c24c15fdd1ab9bdeb6170bc36159892ec7f11a803a87e5186c61112728e5c36981b42a345ce9d7d434356abe84c1596e146a73 SHA512 fb8e967cb3ee8d58658042f63324bf4fd4926ce3caf605c953392fcc7acb3ac81e44a095d1d08368eb5e160f1134e930c1cb30852ce9aff985c05cda8d72ade9
+DIST thunderbird-68.5.0-it.xpi 489518 BLAKE2B 9c0b2a89e22f8047e37b980d4f2bc527a0f3ae5bbb608039ac1f2e2391ce6cd985d9e6849ae00dbf558651dd4a54cdae402465b8bb9c69834cc16d6ee325e75c SHA512 eb32f9f5d115f45b158e1e24f454ad423f58520cacf2fe365d44a5373c9c137c8b474775e06a8f886eff29829f1f625d44362754e05c079ddaf17038bc0c536c
+DIST thunderbird-68.5.0-ja.xpi 643574 BLAKE2B e55e17bd4e5f07003c7159508436e5cdad4261254787bf3f3b975329797a679dd6991028cc7933cfa6434648e860fa6e64b80892c37ca9aae6d8eed863363254 SHA512 09042f718045b38d207f6b682aeb6edc5ad36faa960040a496faec281a3de70c7761a677f94a871bd3ac6a3fe1d4be359f3818b7237683eac082f77608ecd578
+DIST thunderbird-68.5.0-ko.xpi 620529 BLAKE2B ebd4a5564f9acab947bc86cf98ee3be35dcdf613e5295a03af765f72a4b643ceaefda86ac50b94db246f3d2c01d4edce98e960dfd6bc9d1e4b4306ea272060d1 SHA512 7d368adfcc01b267506c8d706ca8b25f737ee22e8cfacae2fa516c68f7a5333d6727dc2c04080a10541671bdd665b6496efa8426ac2348c8d1543b68a498160b
+DIST thunderbird-68.5.0-lt.xpi 603845 BLAKE2B 2eb7cf69b74d1067ca68eaa2d514819963926ed5a1970aba425d27fd83ad87457598c594a8b3c3ade9d71d837e4233207dda81630542029bb1c0311f9265b5d7 SHA512 18a1c7a9ba7a3bbabfaea57e1575cd07b637d8e3b40402a651df62621fbbfb4735e85cdb8c43f7f0c70aa9edd9e38d294cad6107a10c1fa4df981ac2ea426d03
+DIST thunderbird-68.5.0-nb-NO.xpi 574020 BLAKE2B cc73aa8d6e858c581ade22c94b2aba09567342415dfa83168a0e4c92b100469841cdd7cc7adfb059bc4f96b226393efdb44ece3ceb905a8e05103b739acbf5c1 SHA512 fffdc159096e4424a55d30bf5ad9e3a70e125e3fb5aef7cc7fc052ed5c434b7c925981ad5058ac8e8838e3dca9976a73ead2fb0d53667e2884865033797e971b
+DIST thunderbird-68.5.0-nl.xpi 581352 BLAKE2B aebfe99e4d50a89cb573ae40be952fe3bbabf1125c1d8b4c7689d5911417720ae50573c8b345f8799872d1bf4bc399ca41c526ea0480f1229ee914d092676bd5 SHA512 05c253b9125d658799844f51440466c4ec3b38ebeca99f9b15b639cf48cf4dfc7bbe31aec8594e8420d0bc7ee79d081e37ab5b102b1f22c0544558a5f3ee540c
+DIST thunderbird-68.5.0-nn-NO.xpi 574947 BLAKE2B 94a8d7b3dace07ff7f1f149c6778d019e3679e73eacad442944f6dd0efcb9e4960865690094e3f3fd398d23c88bc39738ed53b35e01b7ad79ec96922576e8cd9 SHA512 c5da422505d797a2ae50136b329e526dd232e82097ec90903360494af673c53cd7fb5c7b16ff9ca8d0e68a94faa15ce95789ba96948e8fe26774af707b980a09
+DIST thunderbird-68.5.0-pl.xpi 576084 BLAKE2B ef34e2761a715feff378820634010606fb2dd337b9dcc917dd5b1e594eb2df1338f97677ddf030d4f7e6608061c00f34e1a16bdaf9c1ad476a984c8dbf565877 SHA512 cfd971abdf85cbf4919b5f4ac310ab8a58f38ab8657d6308b69a56273f07f4f4cb97e84cd12cf50f834dd7e541eafc398fd6c72927f1dc9777ceca3c292be3d5
+DIST thunderbird-68.5.0-pt-BR.xpi 589835 BLAKE2B 27fe2358c8522a3a8e951249f61d06b78af97424c03e771531e456c83e512d9e295c25e9ff0f2efbdf941d02246a2bcd0af5953a9bd8382631eaf90e4bf53719 SHA512 b9c65ece92a8c197a91a80e0bfce1cb8689ef634019c98cef37d289a847c64a28bb88cc5f961394a06acbcd295fec935233000a6d916a765176ca3d8365642b1
+DIST thunderbird-68.5.0-pt-PT.xpi 588101 BLAKE2B 32d03c1a68b1f701456d46ef27eae7088d426f65b0ea922d145ce9a8309c6ee54a7deb151eaae2f0d3a5ed4e2725738ac02b0b48056d65eb19552a04b6489231 SHA512 6c3e63b0665b68cbc9eb7bbd16e556f872e926e666f210db09c00b8dfe87e3971011a9380e2ff46f131b29235e8f2c0805644a8b3d5f438dfbf3337ae2788232
+DIST thunderbird-68.5.0-rm.xpi 578048 BLAKE2B 6f27831974c66faa09cf4cf630490ab59e42d365e3c5fea4aa3d02db28f2104f14a60c2fe8842221af127f4ce1953a04c49d573579509ec399a4b09811acfdc9 SHA512 6daf07a82df33b828ef132967acd525744af4f1dd9f651a3dc611d8a393ff4d6cf284910266c3e6ef9414a7558ccbb9593cbfbf3cd6acc9d5303d94c8768b899
+DIST thunderbird-68.5.0-ro.xpi 594839 BLAKE2B 5c4cbaef49c3fadb877cbd7431350b4eb046a6532f035dfe38a13a7bd42c1f65a579484b7bb20b15503e9d6c10a4a9432f33a137f2365e01a11970d03ac1275a SHA512 9b24589c4d3f455f27e19c8d882feaacf48724c470577b894ff5c09d57e8ddbfd3f216fbd42ec61aefbd1b01d816792febba22af54259a248a5c79e4745328cc
+DIST thunderbird-68.5.0-ru.xpi 683322 BLAKE2B 04b5d792c16a36b73dc2e6f7b890e698bf882372150cc5025230b6e9f2678932c04c9490d1b197c24255961c103db5ae616d514d4e278d610a26d481b4ccb600 SHA512 12c55f72a30655693ea780cd9d39d2c59df31aebb8fe48f7b12148cd7df530eca579ea5f1496a9cd5aaf9f9a4a6c9f9d1dda9b7934dc3d0cc48e005142007253
+DIST thunderbird-68.5.0-si.xpi 637403 BLAKE2B 2edbd225b5d39805b4b601fb3a8d3348d98254da32de78ca1e53014782425931448b5e33811e96cd0ebde88ac374dab96b283945ff88dcd18ba267ea352ea9b5 SHA512 f685bd8b1f2dedf35cb0c726c410404d1d443d33936faaf338e0b228daf7a6f27034616c487882afd42441e9a52ba12403010795cc0ca4467ce8136846063952
+DIST thunderbird-68.5.0-sk.xpi 609749 BLAKE2B 1cdbc9a18a08eb8fb1414c86639db9e8511ffacd22f3842ec7a1de7c7ff6a3889c15ea6a64f1875805c9a3de8c6ea3966bbaf28c69c43854445ba93fd06a225d SHA512 2035c17c374ffb23aa572dae277ddc9e85094cd04b3c368bfb2e8fba7c42d9bb7a50932da2291a927789b143e43f0d75ed76185cb18d28712cfb5167a7477c2d
+DIST thunderbird-68.5.0-sl.xpi 590625 BLAKE2B 0da4efff5d0e23fd7166d9fc687013e3037d841c82206e2a25115abda684cc13167674468ea486e28e19a88d719f41a9ad7dfbe2f857a655886c716c23b77af2 SHA512 c77fa0529a07ef99b362dcb15f3a98535d8c46d2d5a396734fd9754b82ee973dc620ea0b1ed0d898612d70a5795920c19259d1ea9eb34ebdabf4b4be420ef085
+DIST thunderbird-68.5.0-sq.xpi 598898 BLAKE2B 471e9690c0348fb5353a9f7ad94167d03940c85d98657f8f00927a2b0793c122bfa16c3a016c193fd88a5a0daceeb8b540cf7e204b6bb9b51cea0bf430839129 SHA512 e5c4401643c4146ad39d88c19fed7afbe933d5f0ce9d023819f11f8229594884799b5040bd71c57d3ab8e0fba889f38ccaf35b1664e84e6ada2688f19c05a9bb
+DIST thunderbird-68.5.0-sr.xpi 624894 BLAKE2B ed157c9f639d7e3c48eb28cce296b8b13e743eb439ce929ea2ecfa1ef628b1f38647ec073b433c5c649ac8e22203a387c97caa501bff89f280340af10828dc0f SHA512 b28f46d258389262d5efb774403a3904bc131b647b1f373fae1d165039d39eacb892091c97a221c9ae8d52db5947703e367864dde624790eaaab7f787eab50ea
+DIST thunderbird-68.5.0-sv-SE.xpi 591595 BLAKE2B 7e22781849ffae33a6a378061fcb18c78cba3249a341326aad2e17bd9e4dccad015e16f7cd6c2dfe2fe07464fd8eb1e7a70bdbb8e0de22e0fcc159123c95004e SHA512 ff3e8003589a206a79b4e8a22003398a91ca424ecc02bb2646021d50def77c0aee4cc2f48dcd166e0ee50e87a67c4d34e93a23417710d978fe0e021d814cc70e
+DIST thunderbird-68.5.0-tr.xpi 599704 BLAKE2B bef9dfcbcb7f402829ca137e023d3fa06e1e9e5646dea1cbc530789134936485207cde742046ab12d8f119eea30ca0ea127d3071080dd6e1694b74fc88ec508e SHA512 996df62ab0f6102bfe34b5d93c7ed2537ea50f95c5f9874ba67f73b07f81c8b618c4f0788a9600db888f5dc5d060ea3628e2c50ec200c1bee71d6a6521bd7e53
+DIST thunderbird-68.5.0-uk.xpi 671452 BLAKE2B 4c9d8ad647928fd91ef0ab1aa90af6983c3bea52d4ce610bf8207c9e602c7ded5a4cac7239c468a27e7e37108533d427159f8345e3855c2139c1915517bfb8ba SHA512 50ac440d0e7e32805dc5551c64c4ba389b9c71380b100750fcc205cc1c26c2f05c15fb6f910a9776e1238a4df2ed6c611fd8382e5d2b6f49f72285c8a92804a0
+DIST thunderbird-68.5.0-vi.xpi 623419 BLAKE2B 65f122fb70da34fd5c89841b1269b0e7b844f1ccd978bccb25d2a4e4ce035b33e5adf1522d0c4de874bec7647fa1b0db36c496267b1fb9d52237bc36df84af8c SHA512 1f9c3884b4cb3f8ef8d23f348b7f35833da10f05d2035c5cfc57bb6d7d34dd71899673156683fdbc538ec6951127ff7f5dfdf054871c6c18f8908d75a8d13ecb
+DIST thunderbird-68.5.0-zh-CN.xpi 626818 BLAKE2B 181c86c15a161862a7d797e4e43921b680400a138e53664f35ba5943b88711c2c1113b15bfd162355de67d89e5736d3e6df2d0f981e73023c6906528fbbceb23 SHA512 80938eecf197724a5c4525d97af31941ca989f99e01b8ad931fc25917dfb5d2850a95724d64185d7fe2392c85f6b58aa52d029ad806555326794a906d676d3e8
+DIST thunderbird-68.5.0-zh-TW.xpi 627474 BLAKE2B e3e8bdd577d776ea01114c56fe9778170ba68948c23e2081a7c7779846e2c39420d10957d853b4ec84b3f9fbd22e4c203111ac4b9e4cabb87c1d77762cea57de SHA512 e3c4593fa1dbf2f3cb5527d76bcf33f9a7291134285d0623c7a0f1a7c4ccdcba64bdb2f6c9cd547836c9fb8339789d928a6a14d95e6557ff78fdd053d84c7d5c
+DIST thunderbird-68.5.0.source.tar.xz 331328840 BLAKE2B e0f654132ca9d3bd921a29a71288524640ec698f762a3235bba9b1493292b4ceffd006d567891ede42175c36894a78a23e22dd8432047b3e1bc64593368b2a4b SHA512 bb58a398f24d89eac5b1816f9d16edadbe65cdac6542e1f6798424c7ea18eb2d4ca46bb03f54c8c365e67d1dec44d3dfb36fbe4f85afe9ad80fbcc1f2984084b

diff --git a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch b/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch
deleted file mode 100644
index bfb71cb..0000000
--- a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Based on https://github.com/rust-lang/rust/issues/64710
-
---- a/third_party/rust/bindgen/.cargo-checksum.json
-+++ b/third_party/rust/bindgen/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial
 eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8
 53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b5
 7cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf
 232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial
 eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8
 53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b5
 7cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf
 232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-\ No newline at end of file
---- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
-+++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
-@@ -9,17 +9,17 @@ use std::ops;
- use {HashMap, Entry};
- 
- /// The result of the `HasVtableAnalysis` for an individual item.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum HasVtableResult {
--    /// The item has a vtable, but the actual vtable pointer is in a base
--    /// member.
--    BaseHasVtable,
-+    /// The item does not have a vtable pointer.
-+    No,
- 
-     /// The item has a vtable and the actual vtable pointer is within this item.
-     SelfHasVtable,
- 
--    /// The item does not have a vtable pointer.
--    No
-+    /// The item has a vtable, but the actual vtable pointer is in a base
-+    /// member.
-+    BaseHasVtable,
- }
- 
- impl Default for HasVtableResult {
-@@ -28,21 +28,6 @@ impl Default for HasVtableResult {
-     }
- }
- 
--impl cmp::PartialOrd for HasVtableResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::HasVtableResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
--            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
--    }
--}
--
- impl HasVtableResult {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
---- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
-+++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
-@@ -22,13 +22,14 @@ use {HashMap, Entry};
- ///
- /// We initially assume that all types are `ZeroSized` and then update our
- /// understanding as we learn more about each type.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum SizednessResult {
--    /// Has some size that is known to be greater than zero. That doesn't mean
--    /// it has a static size, but it is not zero sized for sure. In other words,
--    /// it might contain an incomplete array or some other dynamically sized
--    /// type.
--    NonZeroSized,
-+    /// The type is zero-sized.
-+    ///
-+    /// This means that if it is a C++ type, and is not being used as a base
-+    /// member, then we must add an `_address` byte to enforce the
-+    /// unique-address-per-distinct-object-instance rule.
-+    ZeroSized,
- 
-     /// Whether this type is zero-sized or not depends on whether a type
-     /// parameter is zero-sized or not.
-@@ -52,12 +53,11 @@ pub enum SizednessResult {
-     /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586
-     DependsOnTypeParam,
- 
--    /// The type is zero-sized.
--    ///
--    /// This means that if it is a C++ type, and is not being used as a base
--    /// member, then we must add an `_address` byte to enforce the
--    /// unique-address-per-distinct-object-instance rule.
--    ZeroSized,
-+    /// Has some size that is known to be greater than zero. That doesn't mean
-+    /// it has a static size, but it is not zero sized for sure. In other words,
-+    /// it might contain an incomplete array or some other dynamically sized
-+    /// type.
-+    NonZeroSized,
- }
- 
- impl Default for SizednessResult {
-@@ -66,21 +66,6 @@ impl Default for SizednessResult {
-     }
- }
- 
--impl cmp::PartialOrd for SizednessResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::SizednessResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
--            (_, NonZeroSized) => Some(cmp::Ordering::Less),
--            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
--            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
--    }
--}
--
- impl SizednessResult {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
---- a/third_party/rust/bindgen/src/ir/derive.rs
-+++ b/third_party/rust/bindgen/src/ir/derive.rs
-@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
- ///
- /// Initially we assume that we can derive trait for all types and then
- /// update our understanding as we learn more about each type.
--#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
-+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
- pub enum CanDerive {
--    /// No, we cannot.
--    No,
-+    /// Yes, we can derive automatically.
-+    Yes,
- 
-     /// The only thing that stops us from automatically deriving is that
-     /// array with more than maximum number of elements is used.
-@@ -103,8 +103,8 @@ pub enum CanDerive {
-     /// This means we probably can "manually" implement such trait.
-     Manually,
- 
--    /// Yes, we can derive automatically.
--    Yes,
-+    /// No, we cannot.
-+    No,
- }
- 
- impl Default for CanDerive {
-@@ -113,22 +113,6 @@ impl Default for CanDerive {
-     }
- }
- 
--impl cmp::PartialOrd for CanDerive {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::CanDerive::*;
--
--        let ordering = match (*self, *rhs) {
--            (x, y) if x == y => cmp::Ordering::Equal,
--            (No, _) => cmp::Ordering::Greater,
--            (_, No) => cmp::Ordering::Less,
--            (Manually, _) => cmp::Ordering::Greater,
--            (_, Manually) => cmp::Ordering::Less,
--            _ => unreachable!()
--        };
--        Some(ordering)
--    }
--}
--
- impl CanDerive {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {

diff --git a/mail-client/thunderbird/thunderbird-68.3.1.ebuild b/mail-client/thunderbird/thunderbird-68.5.0-r1.ebuild
similarity index 98%
rename from mail-client/thunderbird/thunderbird-68.3.1.ebuild
rename to mail-client/thunderbird/thunderbird-68.5.0-r1.ebuild
index 9e39dd7..381bda2 100644
--- a/mail-client/thunderbird/thunderbird-68.3.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.5.0-r1.ebuild
@@ -8,7 +8,7 @@ MOZ_ESR=""
 MOZ_LIGHTNING_VER="6.2.5"
 MOZ_LIGHTNING_GDATA_VER="4.4.1"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
@@ -52,6 +52,7 @@ SRC_URI="${SRC_URI}
 	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
 	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
 	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	system-libvpx? ( https://dev.gentoo.org/~anarchy/patches/2013_update_libvpx_esr.patch )
 	${PATCH_URIS[@]}"
 
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
@@ -97,7 +98,7 @@ CDEPEND="
 	system-icu? ( >=dev-libs/icu-63.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
 	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
 	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
 	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
@@ -147,6 +148,15 @@ DEPEND="${CDEPEND}
 				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
 			)
 		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	>=virtual/rust-1.34.0
@@ -248,12 +258,11 @@ src_prepare() {
 	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
 	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
 	eapply "${WORKDIR}/firefox"
+	use system-libvpx && eapply "${DISTDIR}/2013_update_libvpx_esr.patch"
 	pushd "${S}"/comm &>/dev/null || die
 	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
 	popd &>/dev/null || die
 
-	eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
-
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2019-11-22 21:55 Jory Pratt
  0 siblings, 0 replies; 10+ messages in thread
From: Jory Pratt @ 2019-11-22 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     69d033b93757dfc47b5ca729dceb1845fac543bd
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 21:55:08 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 21:55:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=69d033b9

mail-client/thunderbird: sync with tree, update arch cpu flags

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 mail-client/thunderbird/Manifest                   | 108 ++++++-------
 .../files/thunderbird-68.2.2-rust-1.39+.patch      | 170 +++++++++++++++++++++
 ...ird-68.2.1.ebuild => thunderbird-68.2.2.ebuild} |   8 +-
 3 files changed, 229 insertions(+), 57 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 754a4c1..9e7f0bf 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,57 +1,57 @@
 DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-68.2.1-ar.xpi 617167 BLAKE2B b50b430eeba57348a037273dab535e8877ff267459a72cf21bdcf369ce95fd09bf2e86d220eb9559c7a03546f79675af73a28b5b183a737df661742b8e911efa SHA512 39c797056fd7374260635530454ae3406b340041ef411cfc186445d7626e3a0c11d7c976369968e98fd36d3148402bb84d6c79849d14ec3cd25cb04606275019
-DIST thunderbird-68.2.1-ast.xpi 551297 BLAKE2B f4010d8012aae63e032d78a09410d41f413174c03ff4359e4382b56df71f1fae8a134bb8210b92d1f309fcbcdbe3edc9974ae37e25b1a56488b5957b2ffb41b5 SHA512 0487a998cab8b420b5ba662ee35a413bff0b4da7997374036efdb5fdc7265924ee846be891d878d4d0c72d829786808bc2e2f4ea0db5e1b4cb9d4a053134390b
-DIST thunderbird-68.2.1-be.xpi 646279 BLAKE2B 1bbf3911ad591887267753cfe0dbc2abd5860e8f530147f168c8c8b7f662765d7945e9a58f5021a9404d54d81a47e421705d2c521a0a4a9fef1f6f99e26669aa SHA512 e6cd069f7db33b6bc43ea5962aedb6c3579981f3b4ad4490b40078936c7ed0d34dad4f44f2e1245db40a2c02f3580ebd53d0aceedc1dcd8e5e13645fa2e5ec55
-DIST thunderbird-68.2.1-bg.xpi 646226 BLAKE2B 64cac09f1d8e46749c7e69d38f721d54d58f58f22d35b9e972509a80d8982b6bb70f56766c77a3c4c7870e916e0cce9d1370a4241604fbebb81499f06bed281c SHA512 d8835e86f15353de8a4e43f72ac36f54ea1ca0d8d71349341fd8094f197a1b1b0e8734a07c0f8bc2fdb460ac418de5d44ce803a40f76e3a0e7b0c1d905605d42
-DIST thunderbird-68.2.1-br.xpi 574850 BLAKE2B a11e070a7df2893ff52889e243ae8303084777dd4f36a88a9ae3880d9c80226831ad881758a4a629d1155e7fb7b9bfe08cc383ee47b8273b86eb6c474637393b SHA512 944817370fe07d5d56f35e73f4ff61bf231ee7497dec1113348ddbdc124f34d91a661a6a431d4dac8d3ef2b8182ee38b72c8bfda8fcaf060f29bff29246d69e6
-DIST thunderbird-68.2.1-ca.xpi 578439 BLAKE2B af9e331b84bf8b105dda558da450364eb3d7a3fc5fbc247ab9b61f54d7674b2c89e0e4c890f2a55f6626e4f3c66bcaf835b4dcde1c0689a899cc4075e639634b SHA512 e5aae9535e1b04b177409d2992e59419acc4d28541c301e431b708709a1ecd0688b29f31572988d82ae29e0f79c8f4ac8f1fa0576c80efdbd2be36d7dd44ec14
-DIST thunderbird-68.2.1-cs.xpi 603040 BLAKE2B 2b3770e0f89a4d78e331d03137c41aacb2adbb73886c99439beb87507bcffcef8567002fbd5bc05bbca3a489e4440b41f82ea0e80e9bd2704a139388c924b917 SHA512 3c21ca64187a54c9d9c3dd186c12427360e7d3604f0de56ca8ed17c359cb69319cf11d44c9362f18e16c801acf9a435883209055962d50825aee6e2b282116b3
-DIST thunderbird-68.2.1-cy.xpi 589901 BLAKE2B d5be729df11aae41bf269dbd644334aff227b7d8bd89a263834175d23c54ff2d262373d90ffb6479170ff5c791fb30bdfcc35d10d2d681a1a2bd89e6a676b93a SHA512 87a77ab3ef612e21e562bad76d5bb54c64c78a3205d057452d14cc3eb5fdd82358c7fc8989c5be2f981dcd1086a5d057799afde9793c35b36ee7ef41e904b4c9
-DIST thunderbird-68.2.1-da.xpi 588349 BLAKE2B d0d159f3f9ff813379fd6f942fadec09a4994e7076b632c220f89f96a53bdaa3bc4692f5241b39e64e8baeee5ea5473beadadecd82b4dba398a69657a1601615 SHA512 43417fb1c90e398189e9fb5bab3ca3218041aa73aa50577e9e2a4c730d9e3d68277dbf9ecdfcaa0ea575af18382174cda502246f226656fe1648fe964a80893b
-DIST thunderbird-68.2.1-de.xpi 597803 BLAKE2B 1d4048afb4afc6e2b5f6259328f003dc7ac9bb641082648c269e45139a2e9d8d6c136d70bcc5d643c2a8480ac9c80ed657698ad898848b45bca7809009ba4ca3 SHA512 2b5cbd75e1cc11d2843a349282b3dab52b28e640cfbbffe91c90725ff06dc6e31ac462ae7162d3f906cc4f1397f9e39c0820f8302824ffbc150f3ed0583e859c
-DIST thunderbird-68.2.1-el.xpi 699222 BLAKE2B 7fd6e5b8a8785dc95cadaf2932792b17ba73d5b3cf5c78022879ac2d040a84eaff48063b0c075590e0ed5923a72fc257f5aada429e12b5e2f5cbd50b01bc0900 SHA512 d375bba5d93648a969c8378096af79072def9a137ae698920bd6f85321494178c2173f8e852e6da1d7260d0524ca8e74fb5b2a30039151495261f13b97b16df6
-DIST thunderbird-68.2.1-en-GB.xpi 556402 BLAKE2B fae055b41594b6725e25d754838d560d0d871280dc721eba340375fd33d3f634d3cd107c6029825425d974ebbea4a67d3332e2ecc344250b4721681b3398a6f4 SHA512 9d7b2949c1c0537d538a3b66901db69f1998dec2bab5e626cb02df435869ec93cd87bd0eba9e7900e036e0ff7af9efe07b261c5b26d43eed760c765bb9b94d93
-DIST thunderbird-68.2.1-es-AR.xpi 596551 BLAKE2B 63e78b34f6797133c044f8abb1f85bd484db7b850897844985d594ba3bc56b5866298867f6965bc22d57dff68e3252af0351a9b3545de4278dc84d1ca8ff85d0 SHA512 aa476e526985d4597e9ee42ac324a5ecea039f819e3e44dda6dff8ff915b548d6093d7fd80f5948dc1ef1f8fda427d542481d2ab02090c2b967a7e9d17523e1b
-DIST thunderbird-68.2.1-es-ES.xpi 518351 BLAKE2B 6ce7973a7ceb15bb0c1138770d53151b3a0a244ef296f3d1ccffcb29307a8cfefe3aeba75c6a60c38d368f9ef69b6934888a63dcc2df9ba483e8ee61cfd4b017 SHA512 12da85956985b60d3548116ef286d0676c9ed9f07c0d6a41fdcb6cc86d41bc5233bac7ff1e037e9f331f16d359ef5d2920060b67399e3a9c3037153847f176f1
-DIST thunderbird-68.2.1-et.xpi 573579 BLAKE2B f7bfcfde5d919032d656e6fb4a08ba5ea9622d3f52790a9f9b9b68c6089a1f4e6d39c3225b44298970de6ef03162eacbd6bb1088c7fa448e364211ee216cd61c SHA512 9c268d201789248884719ddb8f903514e74fc213bf3b68b9296623590a8b7c62e2c35ad860988ce41dc7d2b1a9a11621dbc9d24a57223fc6a168244669352715
-DIST thunderbird-68.2.1-eu.xpi 579944 BLAKE2B a037187cc14559379ccb9d2e0c312edbab662323e1cdd0a6af1029956e1530b63bceced1accb46caa300d5fce4271f4e115338a6a02885388dc87ef1ccffb6b7 SHA512 6105569789f125853e9d87ffd7dc168aee4edadb4218d275b41835e6d728b47b25fe090827fca534331402dc19946a0bab9a8a4f8a796f86d2c965f4b187e1ac
-DIST thunderbird-68.2.1-fi.xpi 578417 BLAKE2B a8b1417600a5e3a7ad6f03d284bf10ac923aac5164707bbe2f66aaa1103f85093b25a691f10d77bd227d1018480cc0c49076ab42d9111ef214f248baa91c95ec SHA512 72b1273fe35c665519101e9369c6f9e76275d5c7a016e69d2836fbfbbd7e7671bc17880f5c681665618d99f14aec5d1ed1a3b5bff3e735ee3136a500398d718e
-DIST thunderbird-68.2.1-fr.xpi 607809 BLAKE2B dae65329ac67c4db85675e5e39e8252b285b89e6dc906f9860fefc8eb3aaaa427d3944b5717f7764ba49f4b9c82f836ab787adaab94eb96039061394f482112a SHA512 3e033730fcab2208ad27f922f4749be40613e3d8f41486185c5b4c56bcb21f4fe57dc8bf3e9c512895d0e321383779c74e2e7863b565c090b07a9147ac889ca4
-DIST thunderbird-68.2.1-fy-NL.xpi 594466 BLAKE2B 4f7103d0d049c155a1f29d0400b43c6bc1070adec6e0cc530e2dac6a7df494891dd1acf53a3d158d4d896bfef6c784392bf8fb2d76220ecee4949d3b8aa34a12 SHA512 12ef00815b853f8030facb65628f0854cfc77878c2e3b451a144484f5c372731c0f147d08eeffa5f4053bdeac4f833469ec776846bc04c8aeb63525760b7a52a
-DIST thunderbird-68.2.1-ga-IE.xpi 588708 BLAKE2B 938d656f5a79d70e21a27db99d99656bb5494e38314d07d4c2d7410ae0f603b96e405c762181bd96c977518d179a0a7a5e20d93d3e752c8bb70f024e0ea84143 SHA512 a1e6a98adde067f449e662d8e2672923df75d31832b95cd4c72cdfea1e10346bf9256c2b4f0a1952df7d280130dfcd627c575d899ff655c949f5442fd3e8b538
-DIST thunderbird-68.2.1-gd.xpi 587109 BLAKE2B 7b42c358c79b340849f60dbf5ccf843f09a8cd7e7be599463ad5796b5a18485298f5edae8b9f6a2df73a50fee9a79b9e93e39451c6fe8b6dc73c7b8726824e40 SHA512 be261515ab339096f38940274d9d7a5fc78cb1ffebd76905aba1d19dd7fb4601e36becd2ab8912e70113f72f7d0023d4f811964e0d221d94e488022fc1b94322
-DIST thunderbird-68.2.1-gl.xpi 568395 BLAKE2B ea28dffb8f766e33db1693333650845181da6f97c2bba77d30d7fcdcbd7f3f6b876c81990306afd41ae280270a7271732fab25381d050d1533c6c93ac3f0a034 SHA512 1e2289a2ace20342c5ab576adfcf93f86df6a04d69d3290f742f24b0965439f5adebfc7f8747ea52ad6ab271dde94b3e2bf6928f4995f2afce16a09f38d8e1c8
-DIST thunderbird-68.2.1-he.xpi 604787 BLAKE2B 29975c5a9a136ecdbe512c5c6803cc3079e90a049199c674f8a2dfa1fb8f008adfdde9e5548c7572147468081825b4eeac539c3e865c4bdaf29921d36f1d2a01 SHA512 f54e27f3bd4d7dbe08e8a82263da93076e26ed478375c0ab3327e793fa9c4689a9e56ddbb59e154a8100aa8daedc628302996f155138008da5e2bae977fd78e0
-DIST thunderbird-68.2.1-hr.xpi 583783 BLAKE2B 67528a2768f000242d212d88792c47d2ea4ea3ab0b2d304b87d557a8fda35c95d78f31b675904ecec0ce21f1b270166ed0283e8a00495a21ce2d4c182e8d4d17 SHA512 6b9961a82955b63a10d3441388b1a67b07a32311fa67df34c004ca734b20622d0cb04e97696a6d3f1f7021057606937beaf9b490a226b36fc5b6c5ac2644dfb2
-DIST thunderbird-68.2.1-hsb.xpi 616034 BLAKE2B f3f03fe48fc0c54dfeca6d18edd68d8bbd06be7aa35cb1e43ecf5bd7f2d4aa6baa5e2db2a2b8660e6f9c27891b3ebfad546072a82cc6be29ccf8a574e59f0947 SHA512 8459be1e9a4d759693f36ff1f94e78ace6a56ec3a5166622ae8a853c2f30cc8e5b39fa72e75f387a91b10b61d5c2aa270dc455a28f4f81f18875c286a847dd90
-DIST thunderbird-68.2.1-hu.xpi 618153 BLAKE2B d3b8331e7a5559d593c8a994cf21c13e3d1387a578e4fe08421767b3def87a927184bbe0b0a95671d615d423498fbaac003bc9abe9ea09889040480eeba9517b SHA512 9e29d8e960a564a13832b3a6956eb7307f5babe6f84eafd0842c161daa38ec171088ad84de6342825a85efcf69a233d6f8881858463447ccffe7d2ae33dec18f
-DIST thunderbird-68.2.1-hy-AM.xpi 630523 BLAKE2B 095575ef0300c70f2130aa866e0a87ae383c91d87d87607b3eb28a2e50a2dcf476d7b5cba2d3a0385a4fb03560a381932d57fe51ad677d34dcd368786fa0d538 SHA512 6876d8401194430bd1d70325db8bab3fa75d6dd5257ea2bae857af41516b8882e24d073a8dc2ee30c730ae957f85941ae8232e302842fb7e13d53240158dc0e6
-DIST thunderbird-68.2.1-id.xpi 567745 BLAKE2B 2101d0d81335a7f809a9df5ff69755a2dd07ce610ac7c9becf48e384b7cc364f80b4583b9a37794f30ddf03c35bbf98f64d709c20481653f9a111b08ccb9ee3a SHA512 5fbb334067fea501704c0d90d3ff8eb14bef3cfd9fda9e99f43d8c4a2df7ed22712e674de1a28aa2928d65ee17b5af62d2bda56bc5b4fca9d11766feace32145
-DIST thunderbird-68.2.1-is.xpi 575439 BLAKE2B 050cdf4429bf616551eb17b7e1af5ed91ea23ebd4e8e4e9618c90a3464a39cf5dc80193ee8331fbbdb72520d6abe7558c7f1661d331a98b7c7dee95783efb37f SHA512 d40667021c4c8db463d18574ae99ae6a90a813277bc3b6177b6649fd9b3a73d661de4a0962b01ef8bace984b5e1e6ccddd5ecfd8a7641173601d679b259d5559
-DIST thunderbird-68.2.1-it.xpi 489518 BLAKE2B 944e93cf364d3f2a2d4f9e895c38c1563420c492cc6de9c33b38de210418ddb96f5deeffe881c4b2946569bbfe13a9f5408475d495b834b53e50f8bfcdea123b SHA512 545c3e25cce6391c62b770c77eabd28d7a22a11ee7839469eb01437b66d2965ac27d536bb7a8c04c9664b1f24bfa759dd8b2bc113886de5eb087e58e9e7e5589
-DIST thunderbird-68.2.1-ja.xpi 643574 BLAKE2B d76e97801313db9cc173bd49306022cbbf2ade2a2a5100d34c69668e3290e1f1874d9514a879fe7bd8ef5e39355a554c7b24fa78b4092a39ec12677618758ac0 SHA512 281496a229134cfd4151b1fc88db751b18582a5a5ebccdf2661dfa276269111bac2e57fd1505b740a96684a0c5290477e0a250edeff742c1f04fe7dea1c4367a
-DIST thunderbird-68.2.1-ko.xpi 620528 BLAKE2B 25b1f7d548a64c1c71488e28ce07c9d34019f60bd3e32842ac47d130f613aab983545ece7a79c6250548ff8864148fd718f5754ed59c79a3efcc5c7216c31c91 SHA512 c3a95ead593175de64a33f8e9c045fc4aaeeabe3b075185a745afd97aeebfea8125c9e76120ffe36cbd2c32b1101ab3a878d770357c5247e538a657972d0d863
-DIST thunderbird-68.2.1-lt.xpi 603845 BLAKE2B f28eb4bb53c7dc3f8dcdb4df2c0a4e4f9c41d05aa2726a039f21b644aa2232161d1753c05c1df84a6c1001246ef15dc1756f4f093fbda3812e9885ec0873aaaf SHA512 839e741d196670b7bf977599dc9d16303b0df0a24b5189125bb64e3ca4858deee37577ce100a8d73597004224d18fa8df2e4844e9e5156b561d3911a782a2ea9
-DIST thunderbird-68.2.1-nb-NO.xpi 574019 BLAKE2B e670a343042f43331b5f4843093b4887aa90cbf0997b8291d0009202ab4840732312154f1a64ac564354cb38494d32adee5f2691528f71a50aadb9346fb1c8b1 SHA512 293e023d8ea71e61350c8aea8fb5c1cb96bacc7cb570785f4b551ec57d82a37c139ea6547f2036d36721d0a978f82e09ea3735beceeb0e5617f40ca22bde41c1
-DIST thunderbird-68.2.1-nl.xpi 581354 BLAKE2B 81b59458bb16237e01b8d11fb3b8a0f12e04f4c187a73394014870bca9c8de3bc48e33e0fd8ef329d1b51fae7ba9b30d12541e188d51d26f584f5fcfb51a5c93 SHA512 d88a95256acf30308a1e18b849d990168805b103be1ff4099d24494eca25d2669c2cf2c5cc0b7941df68b397d4d43fcf98e82b5c1eb0108c47045ea1d01fddd1
-DIST thunderbird-68.2.1-nn-NO.xpi 574947 BLAKE2B e33a358c97e5efb572f3cc319395f78461241a30e87f71c620089bd6d232d543dff6f241ee2520593dafea9498d786cbc4927c812d3291f2b91f0d278fb39faa SHA512 b0bc58bb38ab4dcd26d992ccaf5e3b6a2b186085d34f62daad5ae4988d13687f2c39a298e599019bb7227ea6bb82a5dab7c2fc77f36518fcf8afcb60398c2b6d
-DIST thunderbird-68.2.1-pl.xpi 576084 BLAKE2B 0ccb5f8d9e04fb26baec2afe0010dbf2385a0f946c52b89a726db30ba91e738aad99701a0d46fc9f580ad5586a0633d7e177c0bf335d27e0216020f76e98c580 SHA512 2012096a7073756975bad44137f9e92842ade15c84b088ab4c7e1f8f99e2ce9ed7ed9002499aed35f5ebb26ee89e7cf33896a3ed3e5bab1673f4a4cbb063b69d
-DIST thunderbird-68.2.1-pt-BR.xpi 589835 BLAKE2B 79eba93e29c0f4e7344f65a0bd52a113cb619e4912ca55a5e8fa48e298bea1aa58baf9320ada9f855e3331410f3e79754c01ce228d14f40d78a70cf25ea7e073 SHA512 4458d7e3126e51c642d9ee4477f2c51fe946fa6c185a111e693eccb726095169c987b5ba5bdc91ce86949641d390467c237c269d242d4f02fc927f68bb4f191a
-DIST thunderbird-68.2.1-pt-PT.xpi 588101 BLAKE2B cd9068ac37bc5d03a4a1f65dca208afefa3d762401fc0499faf1357c5dd3cf719c4617777bf6a1115151410bf00f5d22b1d9d88679da179a7951e23b36238de2 SHA512 dfd5319e607d3132619ae8310ece89fa29830be089390d420cb1c1500f3771edc27c989ffbf6af8af6efd6bb5d10f4e6fa4b59750a79e22977f64a3ea82d3495
-DIST thunderbird-68.2.1-rm.xpi 578048 BLAKE2B 4c586bca850c523d7b223f100276a6b5af5bc5db3c2d11918b6fa2faa7d76e1541ec19f1131c1229e9564d24a69fe1589fe9c1658fc2f9daa0d6c85086f64841 SHA512 b6b471a84913d64226de5aaf4445f9d34a7fb46794484df9f72eee22e4431a52916acf11a4855d7623772d1d7d4ebce293193c62614a5fc2fa0498df1fe6c6c2
-DIST thunderbird-68.2.1-ro.xpi 594839 BLAKE2B 5ca781be0d7473240eb05aa0ca6887a2aad8d7e1f1a24e2be53ba46df3a85ee979f1fe7025159c27fd55444a893d2aeb7725d6864dd37367b82c260ca06a51d5 SHA512 d4c803387d4a1a44e2852fdd293a36e6eb7c3190270622e418a4013ff247c0c41a18225ac929c7e15e09e72524bb88b73805e514a87f6345296c037b6d9071c6
-DIST thunderbird-68.2.1-ru.xpi 683324 BLAKE2B b6befc6c1959503a3984d2e5c6f004105e5b6ee774e5e6b9681ff5a62a090e36ecfcbfbdfb83a45d7ebe59ba46eb24cec1fd9402f712ff0b7e682ac7b045c32a SHA512 2157d0cd2ab13b8a49b2c42255887dba3aaa1c6b0c10512aae441b4b87e443bf85b140dce21cd5c3e9915f38fa06fda914ccc63040b286b8b4aa03644226b82e
-DIST thunderbird-68.2.1-si.xpi 637403 BLAKE2B a46b62fd4b5df7d0701925fbbec3bd8ed40d7ab2b1520be07d58ffbfcfe5e35f8caa51f8aec8f7f1e7aa75e91f1f324969e03fbf2f6083f772d895810328d4cc SHA512 87a28a77921a52fd51043b26391a03b28c310b71b97542d39bb662f8c0b8ece0054c419051af16bdf375d397102fb1f0ae53c899b5e3d66c8396e5775797b3bf
-DIST thunderbird-68.2.1-sk.xpi 609752 BLAKE2B 1b963ccbf20b8761a08d915b13d40746d0bd71eeffea1386ab6e6d7395543d53abea22492a9104e158ef025070a35cc71185c0059d5cf5c320642f312edb0e54 SHA512 ce5706b2e967fd2e8d6c40fcb1c01947fd906dcf69d6c4fbe6b5ba313ff236b2a0c0392bb028ddc84affd0d05e56ed3da9d079c6ca6908f5d621fa57fbd8f966
-DIST thunderbird-68.2.1-sl.xpi 590626 BLAKE2B 1119098b75837cdd1767e2b2a0f28bcf6e06a559a4bf44fdf242ca810701b77413e01c9cdf3461ba755c6ce10176d2ed74ccae355f12fda475b64a0e9b9cec3c SHA512 00917e60ed2f1c34af62061e675aab8aa9b5b0c54c93193a9c3edfbe1155642b2cab5bb4c7220f12371726385368e9de6af19b802b18bedff8862472bd0a666b
-DIST thunderbird-68.2.1-sq.xpi 598899 BLAKE2B 408023ad19ba041583cf2d4499fca0d5f78dd4f93e0ea155131ca539d763b53c56e349c4babb84d26621115f1cc705086dd6726bce0f2db5c4a9394c22133191 SHA512 dc1c9878335b9d9eccf24d614120e390535118d6b16708f8c012d43b7bc64dc60146100d08da2a8275e07a218febb94faff0bb97099ddb6dc5ef397960d2424d
-DIST thunderbird-68.2.1-sr.xpi 624895 BLAKE2B 18b8973395db34cd7cc0c0b9ee791f15dcc0624b324bda1e4dfbf909ac04cc9196438a001f79b188ee060bb46a44f723bd62ba60485ec650c2696cca3e833c78 SHA512 c2f55944f990d3b0eb1543494dd488cfb4e642d2fd8b7dcbbe73ab407660d4d21e47481fff74f1c10162a3e73c36bc82af52ab4ba230d9853aec2993e427f727
-DIST thunderbird-68.2.1-sv-SE.xpi 591594 BLAKE2B fb4e145ccb4b88ef845f0304bd3534dd8a5c150b7ac9d4d5a8b9f3fad6be96165a3ee64f94cd93b13552afd866f8b3c7189bef0ab70524698c5820816fdbe349 SHA512 c62bb3514bed52f6c45b280f525fb0711ca5d74df585789bec8ff6daf4069e9351cc72aef493c2e5b575d10523de3835d0b3b9332e5e3e968cb02ace34df1bbd
-DIST thunderbird-68.2.1-tr.xpi 599705 BLAKE2B 63c9d7c11d76f482b19123b3321873582468cc1bd8abf88a2b9d9339aa9adb0b1c6263bf7af484869d3adf52f8adf7a9bd23337602f1cdd13980dd068b574089 SHA512 0bfddcbb4f3fe7842c3a348648383f34b448d946f86be58216212629b7f097f62cbfd794e5241b80e599248769381af14816d5b24263e0651ef329f1f023187d
-DIST thunderbird-68.2.1-uk.xpi 671452 BLAKE2B 3bc648602768d1841639dcb5e796a4680177522a4b1f0e00955f6d3b7a19eb4c5310cd88a7fbab2064a3601496d4908e39a124665abbe67a4a2ed3183aaa4d63 SHA512 1a1517098c1e50c872e100188b24250ea613aa70521e57c9c806fe7fb9adeefc4b47a1fb761c7386f374682c425297a3dde8aa1b7f21c92d130cc5039b700079
-DIST thunderbird-68.2.1-vi.xpi 623422 BLAKE2B ee7f5664b1d4f9b6108ce5235b7b7446126a63010e4469b1fe076ddabe4036155813005f397523ed62c0d112344005bd8823fe5fbba6dc33e5964fbb8436e24f SHA512 fe567400236fb839a87d28d8c1b350603559c8a479b4a130c47be1d755d54d00b75fee026e84649f21617fd837ddac9a068c1012c4f9a1c7ca62e58c85ae90b2
-DIST thunderbird-68.2.1-zh-CN.xpi 626819 BLAKE2B 177ec11066c6169a17f5444bd51ad1d576199390deea34e865f58a5ecb163557b29d6e2b297e189c671fa3647341ca24d3fa7f78840176dd07198c76aed6bc83 SHA512 13b0c8eb61474d8b41ec14963f784229100fd9c3abe539ac59333c67dc8ed4c09ff2e0c1e349105b3400ab83163715f30a0f48e5d9498abcd5d2fcbb49641a26
-DIST thunderbird-68.2.1-zh-TW.xpi 627475 BLAKE2B 88dfb44bbe46eca62c97e22db52279979dca021e9ef65f1a686040900d6c8718e82a782dce49d6f2fa366599488854154f5fe1f946322d0329b425f87b2cc0c2 SHA512 bd52aed2b4de2fdd87b95edbbaba3b847245498584e7469bfb304d95094a98833cf008c273fbe2b1e0c0e98e359fb2f02e037684d8c6ae69953d240dbbf4de0c
-DIST thunderbird-68.2.1.source.tar.xz 333597972 BLAKE2B 44313e0e439a9e42b9953696d7cd14274e858d641b2b7dafa5e9da67e1659db9a2c48a6f7e6bd8ec8d32e0fcca956db1b152b9663c58f6476b011a94e6f878bd SHA512 2d921cac84f6f09b63c122e54fff7848ff0d0997c8c5fedd87503e487750aa2cde8d117e1a0cdbfbf042cc364554bfd4c81b639635a03d656c62e934b973da7c
+DIST thunderbird-68.2.2-ar.xpi 617164 BLAKE2B 9c241614721d5802cbf612e7f5a21b1416bf40848d1fe9bb5611be74c013efafa2843856d6ab5a00bf9d1dd9c249a8517dda07ddf4434d5d597d496311e0fc31 SHA512 751310b75772d6a028d2866e7c9397ff2157f1069912533393f0eec44b713d1140a754cf01ceec98d961c0d2e99eeef8c15ecb1cdd8f99390531b9ae91602d67
+DIST thunderbird-68.2.2-ast.xpi 551297 BLAKE2B d67cb8b324f1161ea0e6dd423923b5caea40c2a40797b63edc871e85040a778565b827ddfec1f339c6627a2175ff62e14e1f27d6eab7bc088d0db97e63cee38d SHA512 70c39b128df9d30d109959ef939cf80d29ff26d8c08c8cd7b28e7509bff7f70059955b394fca24362026fe1df0ab93908f288736514e58728c1663f91b9774d3
+DIST thunderbird-68.2.2-be.xpi 646279 BLAKE2B 26f55579d80abd3fe0797ee7d8719c541a45124111b8855d0aebbceff38fbe69b5add1784640c305cd1bd25acae81525ea69c1b9ad259f82eb27513cc2d934cc SHA512 bd3e01aa4767e68b6e77f5556464cff3fc32e415bf713b4ccaaf20305057e988e6286ba55ed57ff9a6d80869e383c4fdd8233d777437b75151ad2b7763b3e0f3
+DIST thunderbird-68.2.2-bg.xpi 646226 BLAKE2B c73fc55c51123fb959ac4a72bd7658322f246ce76f8cec363b9058bb98505acce0c161d0343523cd95ba15dfa046dc688800e367be221e8ee0cc5fdc9ed7ad0e SHA512 b4d6754e774cc84c62729fee44a6b8f1779726bf9566a3e83babf389d7c1386d4a843c8e9cc8462d4e37b0152c8778004526290429085d8fdc575bcbc010c668
+DIST thunderbird-68.2.2-br.xpi 574851 BLAKE2B 1685362672e0fffa0bc2cd7c6f749f6d502454acb8fea13272977ed79840e01f2d9b5ecca981d704455710a2096b918a0cc91c0dc559c8fa28f2f16abbf16259 SHA512 ad22ff063fa03298aeff11468f9e1e5dbc4c011f09eecb447670c7c13b784f65571149b4cdca60fb4af570d24ab500b8807f7270384d5e9f4d47b31336c3b480
+DIST thunderbird-68.2.2-ca.xpi 578438 BLAKE2B 2d74f61f842511f44d3f4cfa250630c055fbe27106819ba033d10923d2d13072069d4fab6aceb7f13a8079733bac7cf6a28861ec4ab946323078c69915977d91 SHA512 aa87b07d24d458b630a663125836eb1aebde27202a674e392d0b38805b632f169b75530642d7c5d9972cfe0adb2704130e06fc7df6c031b9f7151f3173a4af6f
+DIST thunderbird-68.2.2-cs.xpi 603041 BLAKE2B fe8014571155ac829a7171a69543077b4bd1b0a4fc69067243ff811bff04d2e16e5a9e09b486d81f74de12be3f979c0edd305917851a89803f93a4b59bcf25be SHA512 647229741fd329aea4b6eea6f22c5f87a6bedd572abaaca0fe8ebad87d0f383b2a3e68fd481277093dfe01b48e895f8c3643673f0aa1edf4aba6285c3a1afd0c
+DIST thunderbird-68.2.2-cy.xpi 589901 BLAKE2B cba6f2e3cb668e2c0f4e1961c009f3f6e02358a1d616d39fc679ab7ca91c13cf1f6921d0f73c095f846628b4485849588c03cb97ba301c721aa1294820479f00 SHA512 f2c188c650ec4856a728a443f9a17c36424c2bd782b436a0faa1cfbf10e86038ece967a2ddadd6b6273acc665832c79ce2095d5c980ea0e647a8f2068148e1d8
+DIST thunderbird-68.2.2-da.xpi 588348 BLAKE2B 15e90b3b3e06df14a0895ecaf9152ca484f4cc92079df28828ec8321c4746d5783c1c4384a37e51ca3111fb63687967c99025f16ba639682f14f33fb4de6c819 SHA512 b68c46f4e7961a0894a5304c0bb71d57e997f24bbfa77d20a7218ace19d8f393edd484cbdb046c0c79dcfcdd2162b03a57c93c003796e4bd965a7498404562b8
+DIST thunderbird-68.2.2-de.xpi 597802 BLAKE2B a15a4ca6a8269d287f93d3855d3441c99b8856fb59171237d08c8f9afae34b1fcd9559f08145b3df7cff9263fcc383aefc6aca300508a4621cb0ab1caa698374 SHA512 c6ca9374d67e5b6009d1ca070d984ac4246f15b5fb20c7bb8291ba801724c448db51dac05fcfb2c8907e1b6b6541a51abdd198c6ebd13b0176e852339ef9466d
+DIST thunderbird-68.2.2-el.xpi 699223 BLAKE2B bdc299c0872724118127a16e3402ba1285af765cb92f28e729effed63644001f35e5165e7d2909e2011c65db45c829c0f509e09ed72a8394f3eec032d6a9c4d1 SHA512 77d234822d0a87d83b5312d791542cffa1e31f045908a9fb7b92032dbcae139a0b1b24083bec04cd4e9a88851ea855c5c9d7c807eae5310ff0d993467428badc
+DIST thunderbird-68.2.2-en-GB.xpi 556402 BLAKE2B b0533af1bc0d32288d3a606b3ef40e0e8c1155c3ed8f6fa5943d72ae2519b3e96ea5af29179bcbaf0269cb431b22e435865cc32e9a3996dccef5335061d7c51c SHA512 49cd5803bb1c287ae3a4cfa374f64964adb3c1ba95437d472ae3883dc46303bc11022a4407515f1e2b564eb3c079b5c013c90f5192e531909f52dd9c37aeb865
+DIST thunderbird-68.2.2-es-AR.xpi 596550 BLAKE2B b4771b661ec447854078d57ab0d76eec9475ba60e984bb5131671e44d5351b952fcc7593d6c5d5f14a2ccae1ff96b3482a716cd0fe60b7fc4a1b106c80fe1dab SHA512 001c4f60cf155d050935b00c70eef7d62c1a8fb330aa6fa8bbf1b442d04a19e62c3bcdc481de3b79bad2a37a7909cc7d4d33a7f73d066aeee02dbe7a60b596a1
+DIST thunderbird-68.2.2-es-ES.xpi 518351 BLAKE2B ea31698e96f66f083b2e465addc89ab3cd0d87a21e03828512fc2b8583b9838265f2cbe3b496bcc4fb88af000a568aead419baa078b425fd6616aa42e5b5d696 SHA512 1b9f2d9c0f77814e8d39033b338610609bc91d73e594d24d091d2ffc60fae0409abda7329a4ffc030afc019711e0efc49d261a45bfe91d28fef3faa3edc1c653
+DIST thunderbird-68.2.2-et.xpi 573580 BLAKE2B 1ac94dc7b4c20457185658d642e0992f5bd3fce54bc3ae29117927f156060a41b65ddebc3117d3888a36c20469c707859c815227cfb866df4fe1ed301ae01313 SHA512 57997e5bca9bea1d863db0d0eb043b05c331917cd044321615d2537b0947b5481b7b714dcdd28754d9133249b4a0ebfd973a5c6825af0563d6fb2dcae68fe892
+DIST thunderbird-68.2.2-eu.xpi 579944 BLAKE2B 4d75057110258dfac4313c0a6583bcb21fd76db48631ffd243091354d0b4ba86aa94a801925102e091ebf97c7573176d3d6411dbc0a9f2764628dd0b108fb19d SHA512 3047dcbc46c023d1897b724243f4993820b0e4f9380c355c075e1237151f699359a998d371ca7441201cf4cd1060b9b241caa5a8b7c18503f7e5035be32776d7
+DIST thunderbird-68.2.2-fi.xpi 578416 BLAKE2B adcae84f5bdd25387c9053f52860f6b5e09b2816cd8628983de18a531ce51436f43ca4a72cd2b55960097df537b056e68f2e8b4d201aa9654c710c20a022f05e SHA512 b6dcf0624c84bf19192caabcdcc4b22fc9946d1b3541613dfd23c31041e039dd24208db550fec36c5e85d4807c4efcaab4b949936848297bac1bf43049525a09
+DIST thunderbird-68.2.2-fr.xpi 607809 BLAKE2B 2dfb08d9de21e885cf1863e3340a7b2dc67c98ad408e129592c70f6a6aaaa9b81a9dccfaeab91b89ab77b64627dea6bbc078313e3ee6def319398719cc89573e SHA512 acf16ebab0eed05b99ec55e0a47d6a43817be6e25b55b1b5b99ac0c766e4e9c7d1cbde5631b320c6b9e57c7274a755d3ac8efbcdde5568038f4400fedaea59b8
+DIST thunderbird-68.2.2-fy-NL.xpi 594466 BLAKE2B 4615677160a4d3c8197d6fcf26561513a3cf473ae127f02a37654c2e420cb1c6de7b542fd73adcf14286221209832a0d3e52a30a850dccf3502613dcf3452386 SHA512 ca3f459a782e43edd36cf8f446e3c364cd93c9a3d724f45ebe73e36e5e6fbb460311d3652fb0a88e82ca9b819e5c90be4102ca39ab33da5ab87673a539136346
+DIST thunderbird-68.2.2-ga-IE.xpi 588709 BLAKE2B c7141c8f672324e36e712adb03b5d613e894b5f2540261238b61cd11c8fb2d851f8a17d80c51aeaa97864bc4c9290ee824fe7c9fa1865123bc25eed218bba6b6 SHA512 1cfe403df401b3d6fb0de4ade1eaf545c917023b287cd87d5392a0a9cbf802b84c7ef90a667cccffefe7e9662843b5df1e52f366e06f564ba22cb47aa63b74f0
+DIST thunderbird-68.2.2-gd.xpi 587108 BLAKE2B 2729261acc0ef9a671d6284328dab07606a746c301cf1ec76704b98a0a72a528ca167bb86a3b8e0727a14fedc85070d1e8f6967a5bef3d59260fb2b69d90b623 SHA512 b206f8a11c021ce38bd80ebee47f6e541802b0adbb3ee2350524ced62d096db7757db637b3b0e53adf43a03376d792c35d9740b84ad10371689f71911d96d97b
+DIST thunderbird-68.2.2-gl.xpi 568395 BLAKE2B 53a3a758802d5b0f65699c0008de4240026500a5b531ac12383a06d6a8e1b5cae0f5a257d03726cfbdf4cde93fd561698128cd798ef2b9fbba4b08538dbbeced SHA512 a1257e57ec4f2dcf27d0f48b4e06c7b2cc8e8712eb68f0d8bd7ec51d2800b8f28208a94228c010525beddd8cae8a55751d9c280c44d1184692cbe9872fcc38ee
+DIST thunderbird-68.2.2-he.xpi 604786 BLAKE2B 9957413334fe3d645f65f792f89a6070dfcea97deb7562ea102baacd65b44ad920d85b2a49f4d62a82fc9cb3550f53b3f70bfacb2735cd806728fa2024ee25fd SHA512 627aecba77024e47f178acacb90f47672e61b4974482a4c647d578205f22bf18c87a4701ebdf6c1912eb3c12c99129d1cf08814eb39c379b8db0e174269e356c
+DIST thunderbird-68.2.2-hr.xpi 583782 BLAKE2B f9cb82fe1941d238b914ab86e1fea9f56b62ca54462f6ed06cec0565ba48198d70eb68277ad5bb1d8e9b5ab3ec5162ff5402c54e021cc921613ec926600293d7 SHA512 267f10ab9e6fe45a66a4b86f42e46d5d79a568f1d237d4e0efc175cdd8754c0bb2b676a9f2fa8ac07da6fd2949dcb0ef378f04a29a25bab4a621f07e532c511e
+DIST thunderbird-68.2.2-hsb.xpi 616034 BLAKE2B 9841109ea8794b0422f7968ae1e857274b96c985102aa233361d37570144ad4b4911c6226ef5b914eaa0a025c49ab4bd4b385a12b37bdbebaa4037ab652f304c SHA512 7cfc5ed7db2b8a25f30e4346862befb50d902fc83fb111040c238308a347ef44c92d7ec2f7e8a456ca024fc02d268d49ee65ad3c62e7f59bd22e12b32ae40ce9
+DIST thunderbird-68.2.2-hu.xpi 618153 BLAKE2B 80377f937fc9874b8b9bf65a882bfdc0abce827a32b155fb99252492657b7d32f345cd0e8db13f7050660b82899f0f9591e36f8d23582084f90c354f25bc578d SHA512 6bf5c5d7f65b1eb54aad1ac7e4bae899ed4a7b6fc3bc5070071150eedf2294f8a48eb94beed6f79fdaec819b40ec079d21f2283e0afe97b8fef47c6f7a05134b
+DIST thunderbird-68.2.2-hy-AM.xpi 630522 BLAKE2B 61685a681309428cd7c6f0359a7227fcb6712afa4b0d069c21aab120783826bca7b529d7f939655bb074b2852d381f5fbef757306c15b788b1e791f51155103c SHA512 c52fdde76e05c154ac5f40ef17f040311347a367387f25bf5c7b4a691d38c9eb98e157a640ab3f3a25c2adc19c7cac650471ae95cc4c97a76289a9057aedcd27
+DIST thunderbird-68.2.2-id.xpi 567746 BLAKE2B 8acc16378fe4c43c1370412a8fae81bde4857a199fd29f72dfc3780921a8c3e0d6f5d60c0098b5ee9c585f7a8d9f7025fb172ba211556525df2d378f9dce2b66 SHA512 639fc48c6dd4827477868205e5e83bbd059abdb04d9d66305fa19ced20befbb78299737079267ab487581c2728ae5f0f028cef5f65213cd6f477b3cce0a52c3e
+DIST thunderbird-68.2.2-is.xpi 575439 BLAKE2B ac38e8dd4a0ef66c7e7e1e6fd19b37a96a873838261f619d57abdcacd58012054d201fa5f33d4dfb88c5fad78be1383c4b19d91955c916acb48d3f9470cdb8c7 SHA512 4d3fc6d846b547fa1f43102a24858d0934700fb94b9c755715c040470731402d278c695a57eaaa2211669278e26aa91e1c0404b027dcfa81ebefed200fef8201
+DIST thunderbird-68.2.2-it.xpi 489519 BLAKE2B 0b6a7ee731fb7941694ff87fa9e4b588d772b760c335283458a3f18368f115318e1553004bbe6bf8f354959c4dd3b15a1731c4b3989ca3a1192baedc05250958 SHA512 b23149ee8f1bc99ad8a62daae2d5560abf7ccd506dd65e955cc4251f1cf0a5e39ca7609a070f66617883b9ca643e023bb1e45ff7c523e41bedd2b017819e892a
+DIST thunderbird-68.2.2-ja.xpi 643574 BLAKE2B 12305f8201e75acbf7e84e8bd2d4f6d4ee50b2672e491d8c241895bf7ab1b81f7cb1c4b8f09d4567bc2c368d192db7d32f63d4b53299e1effeedfb357be3c219 SHA512 8b2019e74f323447571686f0e97e4bbbc3e9973b25e91b5604a3becadeddf3f03c2bdaca29ae0bec88121a23c12d737b199c17efe05d3add448e5dc94ef59cd9
+DIST thunderbird-68.2.2-ko.xpi 620528 BLAKE2B c4c196521661d3ac2c44004d6de36ac203db15e124f056905627f1f9c721d558bca2b8cc8fd72ff24ad779b14d38ddefea56f56462c702735f8dadaabfca7edf SHA512 c6a6b964eba1a9132d6c4d64d142071f8da60566373e1ff6e7335a379f6233d2935fad49775ff5c9a06934b13698022a5d9f6c015ee8dc7e960f3de495bc9e3a
+DIST thunderbird-68.2.2-lt.xpi 603844 BLAKE2B 6582c6ffb7cee0a49601aeef088279eddb2ea71803027b474b377ce8d985b935b02b3148d42c386e5571bac3e1703f016d8c80660b27cd876d2aceef2bc1b5e0 SHA512 b5b79b34c140816a8ce31aaad0d4f6830096e37888819a18aea10d44401b7b889cf4871c915ed8d32bb26dfae45366b0228a1caeac21db78bc549cf877702305
+DIST thunderbird-68.2.2-nb-NO.xpi 574019 BLAKE2B e062c51eeff5f693c4076afc0b536c77ff6ff98da1cc7f8363049b0a7eae27a15c0012a5efa50395cbb6256170afe2e52a29dc6f71f96677c04e58d4ce301081 SHA512 144a2c75479dbb76bb3d2a1ad3520bcc08aa9ef97373d831e552424a7ea0a47dfdfcd5a4b9815c65df6ebc73e359091326702f440b45dc79ba4a2f6c8f442fab
+DIST thunderbird-68.2.2-nl.xpi 581354 BLAKE2B 9b3cd9f3ddaa20bbe2e05aac07da5db1ced6cdb248a54ba7ccd8588890e7702b327a9f9c61b6e292ad2429e76eb15845d6efd34fb494d410ff6df8ee85d3c79f SHA512 2fcf5681efc36f73181d927b94782075a774f06cf5b5949caf8ae17481b299c8a63ce6c5ec3c1f2f9ed3eaea8e02638177b229adcdd58fb7aae92fc5ff4a4688
+DIST thunderbird-68.2.2-nn-NO.xpi 574947 BLAKE2B 8c2fbb9f70ba4a969f76a8421c4fc39aae78def3e86f2323c8d53ce938a709b41b189ba7c4e9b3b3e819acc9b03cd3b9fb71df8ad11157ce4c189a45c6b37e0f SHA512 4abdeefcfbfada72b459437a19f72f390dd03989fc057c6d375132527f4c298ed6fcd5b9aa9705976b6fb163de7d8581a7958c18c5626487b697e7e8d132e02b
+DIST thunderbird-68.2.2-pl.xpi 576084 BLAKE2B e9517677ce1eea31135d5edcf92355e94b74655433b10e0e1c3f410c5e4ccf388f82a0ff886477b73759bc4596f11f4f3e61f81ef32b3671b3e59c3f8efd3ce1 SHA512 ccb03e1b18ac2226cfd40e854697121f0710c8955afedc32efb4182d1f846bf15c4988dc18a8a8710f3c0812697956dc890efa3ff8afdf819c6cb96af7dbc7fd
+DIST thunderbird-68.2.2-pt-BR.xpi 589835 BLAKE2B a03592a60d33883cee4c2a324cf52b3055358fbd4a60f5d9fd8ec76b7e85b3a6a7267634643636e4ccd743cc062ae2ee71dfdabd0668a0fa656190b71240733b SHA512 6955ec5002e3ae0f411e2ef641be457a0476bc14662d24f180db8067cb13cb1f82248bf08bef70382e34d40dda02798f379aef54119de250ef2715e58168ad1d
+DIST thunderbird-68.2.2-pt-PT.xpi 588100 BLAKE2B f0d4338aabcd7f6a8c40ee15a7a4acd7b81dd6b2609fe153c266c130abe9c2bb41e75545ffe984e0350ef6dfb9d6d946167b5b8bbd427be36b5a3a3a2bc63803 SHA512 3cd8186f492b06e5c7374bd7f6974d96b0e291deaf4d74a13d9411387e71f1ea25e0aeeb8c146d8244ca69f137112ca61883a2b99fe3f978a67dd05ace3b5fae
+DIST thunderbird-68.2.2-rm.xpi 578048 BLAKE2B e257e69809a4a541bb479777cd602d0c03afac7949b494c484dcb495954a5628938f9c51d7ee4dad251646f86e7d69dea55e69af930810685ddd7c2e68e6ab0e SHA512 a3fe6f53206e35589c6c63431ea661f086a1fe588d6bbf33a2331ec3814dda9f0e70f1da3110fa39ba4aa6a141c3c17021749fece2c65c690e079b062b3589b5
+DIST thunderbird-68.2.2-ro.xpi 594840 BLAKE2B 68f39e47f9764680409852c4e4f12ddf044ce85e91cb6cda7a6882f949d1332fd5f4b40765a8bd25595731c4fb8b35e34506457067194142281b9442df94793f SHA512 9a5ab66c2ca6bf55597c9d28a264e403a77065ee0de2cc9903343165865d5d76e804b5fedb58d07a23b0cc710292a9b193d60fccf01628872c94b7b2dbd3b5cf
+DIST thunderbird-68.2.2-ru.xpi 683324 BLAKE2B dbf6ee21fc68ba08fbf2046f09d5ea2124df81129c716742aacb08621ace4e5123b5b50bff1a1e2a98ee11b5624770e21eb0cf87c0ff48e7d4d3185666f4f4bd SHA512 c5f7226a648daf6ed3e1e44d219f26cc3c991b8ef299b29a8e267c7ca4bb8da60b4e93b3a8f0fd77b9887d8803933539abfaf9be59a3b4986c526917296c21ae
+DIST thunderbird-68.2.2-si.xpi 637404 BLAKE2B 9c2f6338d2d2042cef81b98bb3dd91ee1e271a5b2d9f25f1c217f2eb365277ff500fa84045e940524dcbca4e1d0ee7a759de7a18186e6351111a8c91f3037c6e SHA512 46219b4e19767b1cf2d6e7f9a2a00a10bc2a60feead67531c64b6ef6c4cc7a6136d0e7c2e1dd9a879fe2a3f0fce311cac0e508239c579bd0f8eccd76aecb717d
+DIST thunderbird-68.2.2-sk.xpi 609751 BLAKE2B 4e305568ca189ca8e1a3ead7d5137dd23f28a04381b4d40b42d9e8b34ba4536c1a8d8bad4ff15446e835a0129db1945fa031d452ede73c5cc66adf8f27dc0097 SHA512 6c53639ccb3d645f7ad8760b5372521204299bd2b4e477ab33ee9dd193af1ed2028f138944613e4f05c9615318183bed91c384ad9a2571030eb02021eae0aa3b
+DIST thunderbird-68.2.2-sl.xpi 590627 BLAKE2B 5feb5883f89684ff100b6a38aa5aac0454ca062a0af162bfd3a74a367a07b960bc9286d8fb78e835a48f88e7fc7391d92790d7ff456c3a0ce84345b3a040f8c2 SHA512 fed6d4e780d122529c7164bbec07d04b81dc374b44cc156d70d1353cf4f3d321a3c3dae33f71f028069e710578a31a6287392cb4cfbe10779a241e8ea2726f61
+DIST thunderbird-68.2.2-sq.xpi 598898 BLAKE2B 3d89133ec517b1790cb81295d46d9f9cba344f50fc0717c729655fc4a34e42f9e53f42164da898e5b562bcc7298467268bfa6a9bc6012bcc310acf00505f6213 SHA512 db2cc0657e71c03f6cf4668f950b4d2739ebaa7eef01a21146639225fff0a627d71fa4155b1d7830ace8008d342b282730785e89c2c11e1a1b48d0e1d54c0852
+DIST thunderbird-68.2.2-sr.xpi 624895 BLAKE2B ffca8df7e7004b7687ca9c69fcdc4a3333f144588f308ddfb58b9c6417c80aa3100f10781a8a93ab021bd91319d304b9c9068208086d25769a500ccc7f0bf51d SHA512 a6a8bad2bd3d234be269f4d36802b2253d17eed20c1e2fa8056f3d6fea155a4027409cc6c735c3b496c84a8432c6aba0abe49d0096dbbfe3c1c932c6e589ef0d
+DIST thunderbird-68.2.2-sv-SE.xpi 591594 BLAKE2B 38243595e5555db6457a38c2ec8716084a4ef5ce660e864fbf93e97dd0970d7c686aef6462d5850a930316f78002caced0e818e9b69d60c8e9b56f7904e57ed6 SHA512 c9fd588754e99247c767038bf833b82ce8f01d288f961bb5314f0aa634be954feadbce2965f2a879c0682bbe4e82d5da4514976b0fd5d370dcbb510f278265db
+DIST thunderbird-68.2.2-tr.xpi 599706 BLAKE2B ff4fc3bc17197c2c5798ea46d54c87576ff4a5c420b751b44ece906aa6188ee677fd15018c239a97428b635eb1becd4a95fb2fdc349b4ba73deccafbf2756221 SHA512 340ff1145ca10b828ba6eb584c98247949bec467a748e31e2d691bc3960a66b805a772b048ff0f96a69fb7d4ef1c47dd3200ab26388d8a0f5e9a03e403037f14
+DIST thunderbird-68.2.2-uk.xpi 671452 BLAKE2B 06996c4bf847d33491a92c7282deafb4eb24cc34cf4b4fa4823e0165a889f0ebca0c34744083ba36bfd502fbdf268bf8ef9b6c6a4c2215fd82dea6af6504119c SHA512 3e6498afaf10cbe2fe36c807440d2d56ac19a4af308d7aab98960d4f992c705b23560f3728bb74a7b24794240491dae208061c6161eb507067a593d717aafc84
+DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e1bf1a0ac6133d2d5e6ee4254d20e0726a81d8d6c1ec01d2e50e5b1e0d0ac6dfba0e1c05e5bbb57cf857b3a9230db4a SHA512 b613ffafe4fc240d82f50b086f186e4149835a168c8a931fa5547e1ee87e930d1fbbbef90045bab1264f810aee51f7dda492fa133b0f6f89d274a4bd349171f5
+DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
+DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
+DIST thunderbird-68.2.2.source.tar.xz 334809520 BLAKE2B e532d8b48ea0872fc69a7b2fe418dca551b5dedf6276671dffb72ce5270fdcc7d63ef835ff4ddf92b870305267fc52dbbd3f3d00f154debd308b9a569ef00422 SHA512 96c9d7b7820091896b174e2c7924e426fa0fd2e6edfa8268ab502c1292a7456d3d864f97976cced0a5e9587bfa2dd92023df1a52f989729a92e0ca604e5ab5eb

diff --git a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch b/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch
new file mode 100644
index 0000000..bfb71cb
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch
@@ -0,0 +1,170 @@
+Based on https://github.com/rust-lang/rust/issues/64710
+
+--- a/third_party/rust/bindgen/.cargo-checksum.json
++++ b/third_party/rust/bindgen/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial
 eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8
 53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b5
 7cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf
 232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial
 eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8
 53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b5
 7cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf
 232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
+\ No newline at end of file
+--- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
++++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
+@@ -9,17 +9,17 @@ use std::ops;
+ use {HashMap, Entry};
+ 
+ /// The result of the `HasVtableAnalysis` for an individual item.
+-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+ pub enum HasVtableResult {
+-    /// The item has a vtable, but the actual vtable pointer is in a base
+-    /// member.
+-    BaseHasVtable,
++    /// The item does not have a vtable pointer.
++    No,
+ 
+     /// The item has a vtable and the actual vtable pointer is within this item.
+     SelfHasVtable,
+ 
+-    /// The item does not have a vtable pointer.
+-    No
++    /// The item has a vtable, but the actual vtable pointer is in a base
++    /// member.
++    BaseHasVtable,
+ }
+ 
+ impl Default for HasVtableResult {
+@@ -28,21 +28,6 @@ impl Default for HasVtableResult {
+     }
+ }
+ 
+-impl cmp::PartialOrd for HasVtableResult {
+-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+-        use self::HasVtableResult::*;
+-
+-        match (*self, *rhs) {
+-            (x, y) if x == y => Some(cmp::Ordering::Equal),
+-            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
+-            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
+-            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
+-            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
+-            _ => unreachable!(),
+-        }
+-    }
+-}
+-
+ impl HasVtableResult {
+     /// Take the least upper bound of `self` and `rhs`.
+     pub fn join(self, rhs: Self) -> Self {
+--- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
++++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
+@@ -22,13 +22,14 @@ use {HashMap, Entry};
+ ///
+ /// We initially assume that all types are `ZeroSized` and then update our
+ /// understanding as we learn more about each type.
+-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+ pub enum SizednessResult {
+-    /// Has some size that is known to be greater than zero. That doesn't mean
+-    /// it has a static size, but it is not zero sized for sure. In other words,
+-    /// it might contain an incomplete array or some other dynamically sized
+-    /// type.
+-    NonZeroSized,
++    /// The type is zero-sized.
++    ///
++    /// This means that if it is a C++ type, and is not being used as a base
++    /// member, then we must add an `_address` byte to enforce the
++    /// unique-address-per-distinct-object-instance rule.
++    ZeroSized,
+ 
+     /// Whether this type is zero-sized or not depends on whether a type
+     /// parameter is zero-sized or not.
+@@ -52,12 +53,11 @@ pub enum SizednessResult {
+     /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586
+     DependsOnTypeParam,
+ 
+-    /// The type is zero-sized.
+-    ///
+-    /// This means that if it is a C++ type, and is not being used as a base
+-    /// member, then we must add an `_address` byte to enforce the
+-    /// unique-address-per-distinct-object-instance rule.
+-    ZeroSized,
++    /// Has some size that is known to be greater than zero. That doesn't mean
++    /// it has a static size, but it is not zero sized for sure. In other words,
++    /// it might contain an incomplete array or some other dynamically sized
++    /// type.
++    NonZeroSized,
+ }
+ 
+ impl Default for SizednessResult {
+@@ -66,21 +66,6 @@ impl Default for SizednessResult {
+     }
+ }
+ 
+-impl cmp::PartialOrd for SizednessResult {
+-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+-        use self::SizednessResult::*;
+-
+-        match (*self, *rhs) {
+-            (x, y) if x == y => Some(cmp::Ordering::Equal),
+-            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
+-            (_, NonZeroSized) => Some(cmp::Ordering::Less),
+-            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
+-            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
+-            _ => unreachable!(),
+-        }
+-    }
+-}
+-
+ impl SizednessResult {
+     /// Take the least upper bound of `self` and `rhs`.
+     pub fn join(self, rhs: Self) -> Self {
+--- a/third_party/rust/bindgen/src/ir/derive.rs
++++ b/third_party/rust/bindgen/src/ir/derive.rs
+@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
+ ///
+ /// Initially we assume that we can derive trait for all types and then
+ /// update our understanding as we learn more about each type.
+-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+ pub enum CanDerive {
+-    /// No, we cannot.
+-    No,
++    /// Yes, we can derive automatically.
++    Yes,
+ 
+     /// The only thing that stops us from automatically deriving is that
+     /// array with more than maximum number of elements is used.
+@@ -103,8 +103,8 @@ pub enum CanDerive {
+     /// This means we probably can "manually" implement such trait.
+     Manually,
+ 
+-    /// Yes, we can derive automatically.
+-    Yes,
++    /// No, we cannot.
++    No,
+ }
+ 
+ impl Default for CanDerive {
+@@ -113,22 +113,6 @@ impl Default for CanDerive {
+     }
+ }
+ 
+-impl cmp::PartialOrd for CanDerive {
+-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+-        use self::CanDerive::*;
+-
+-        let ordering = match (*self, *rhs) {
+-            (x, y) if x == y => cmp::Ordering::Equal,
+-            (No, _) => cmp::Ordering::Greater,
+-            (_, No) => cmp::Ordering::Less,
+-            (Manually, _) => cmp::Ordering::Greater,
+-            (_, Manually) => cmp::Ordering::Less,
+-            _ => unreachable!()
+-        };
+-        Some(ordering)
+-    }
+-}
+-
+ impl CanDerive {
+     /// Take the least upper bound of `self` and `rhs`.
+     pub fn join(self, rhs: Self) -> Self {

diff --git a/mail-client/thunderbird/thunderbird-68.2.1.ebuild b/mail-client/thunderbird/thunderbird-68.2.2.ebuild
similarity index 99%
rename from mail-client/thunderbird/thunderbird-68.2.1.ebuild
rename to mail-client/thunderbird/thunderbird-68.2.2.ebuild
index 7d71069..41e9f48 100644
--- a/mail-client/thunderbird/thunderbird-68.2.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.2.2.ebuild
@@ -40,7 +40,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
-	+gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
+	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo pulseaudio
 	 selinux startup-notification +system-av1 +system-harfbuzz +system-icu
 	+system-jpeg +system-libevent +system-sqlite +system-libvpx
 	+system-webp test wayland wifi"
@@ -261,6 +261,8 @@ src_prepare() {
 	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
 	popd &>/dev/null || die
 
+	eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
 
@@ -454,7 +456,7 @@ src_configure() {
 	fi
 
 	# Modifications to better support ARM, bug 553364
-	if use neon ; then
+	if use cpu_flags_arm_neon ; then
 		mozconfig_annotate '' --with-fpu=neon
 
 		if ! tc-is-clang ; then
@@ -563,7 +565,7 @@ src_configure() {
 	# when they would normally be larger than 2GiB.
 	append-ldflags "-Wl,--compress-debug-sections=zlib"
 
-	if use clang ; then
+	if use clang && ! use arm64; then
 		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
 		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
 		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2019-09-29  1:36 Jory Pratt
  0 siblings, 0 replies; 10+ messages in thread
From: Jory Pratt @ 2019-09-29  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     fbfbeecd35830f3df3b7c4d3e64258d631e0144e
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 01:36:37 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 01:36:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=fbfbeecd

mail-client/thunderbird: sync with main tree

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 mail-client/thunderbird/Manifest                   | 110 ++++++++++-----------
 .../mozilla-bug1554949-linux-headers-5.2.patch     |  46 ---------
 ...rd-68.0-r2.ebuild => thunderbird-68.1.1.ebuild} |  17 +++-
 3 files changed, 68 insertions(+), 105 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 46c8892..cf862c7 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,57 +1,57 @@
-DIST firefox-68.0-patches-11.tar.xz 15404 BLAKE2B 5322c64f7605e30aa1daf650cea19b66ce6c305d2862d76c4a4103676392cbd3029a8f35cbe8ed8077ac7cfe8194c08a0cd3cf25fef75c62a086077d0c5a419a SHA512 1897303b6864ca941afe6ee1d95fd975fb29a01f52d68f9f42c1a9a62d7e4fee0a797aa169b58dc4cf068916e01edaf5c9ad8ade23a997e52c37bd393a142ade
+DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
-DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
-DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8
-DIST thunderbird-68.0-bg.xpi 646231 BLAKE2B 1bdf1354b9016f65427158b7cdc6a579fca36b2371b822c67a865fe00730a3d27382a2cc95714907b079d98d5c751d6e47c3e50e7213a3745805baa32648f342 SHA512 4dc0f6cb5d9000a6fb247dc838ad0aa78403ec1cd877343e44dd21b3a8538017a697ca17a56305e242e9a4e5b463ff90f97eab4dceac96b7944c42464642b96c
-DIST thunderbird-68.0-br.xpi 574856 BLAKE2B 34beea12df59f89e4effc02e2cf80d4c1b6cf2bfc6295e8e0f978f5c50c2db3ef7607a5a9b5cd3729751c183628863f64c64c7ff2db9b9be085f2cf70b0608a2 SHA512 d7da4b12c55a0b5bf708c7ff1d479467fa66a2cc48e3478316b8137d4fd813bc479214a9a2b85633e886237dfa78330ee9ddd4ab8548939ad72cfb1aefee79e3
-DIST thunderbird-68.0-ca.xpi 578443 BLAKE2B 115c2a57bbe4a6c87310ac0bf23091db01e03428d8f3daf9c48b785abfca0533677927021d6731a42171f3d603f487708d7374e80025b9fccb744dc5f21a1066 SHA512 240fc2a770c70c8e86fe5b80efb8224d0ad7ab32df94da7ff995a0182a865d167d46410b0f2ac08569ad706340ca44d783e09d29716dac7ad19f21487b8f2f95
-DIST thunderbird-68.0-cs.xpi 603044 BLAKE2B b72472d609e23b5f1a1c77152daef006cd2813485240bd7350055a0a7f257becdd675b076d4a9365d997a80dc248c8ae2379a3ebaad1a0e0fb08aa790f47dd29 SHA512 2ad612175d867332907512aa3905bd4662d25c4ff2bd6d9b91ecdb5b4144f98dadd033dca289ec2e1ddbfc7ee381f2ee4e2eef6c0d1d1dee212a404333cdf8a4
-DIST thunderbird-68.0-cy.xpi 589906 BLAKE2B 822528f6a5600a62054397fcb0dbe6b1f544560160953de6ef7002e3400b899f648acecf3bc286359561222db6b7377da76cdabcbd3e4402cfd62b2c541d39fa SHA512 9981ad7b33a035d04d90fcdce7a537a08150671f6e81e2dccf61d2a6da213b2b1b7091ef93d80904dfd6cd7bbf978460f3f045384ae9cd5adbcdf747b434ce14
-DIST thunderbird-68.0-da.xpi 588353 BLAKE2B 8e45fd37b250e504f58094667704cf5c9d282943c64f8c2a2ee624eba0018b5a0c51897704ba6ce29a4ab3600fe89fb23528300415ce66b2f8d131f0631fa165 SHA512 1c210cebf73d21d59215a54e09b20ec08479e0c4058a92815c2e17c7f9713e3c6387f41194e2f562d3c7500a3e9cf0d0cadce5da83b972a51164a7334888b890
-DIST thunderbird-68.0-de.xpi 597808 BLAKE2B 64b275b262c402859e17b2a9caa7099349301a48d8c1370e3eaefcef46e4920933f98cdadcb8dfec4ede0881fd575fd7427a2e4a013a888cfe61c62c62b3732f SHA512 820a94b15c2cf1012739e44f6ff9c475ad60e67622931c696f0443d19892db2b697886452f0a9f9fba7d40611d5700ba602b8acdc6833122524e3aff0b05a976
-DIST thunderbird-68.0-el.xpi 699225 BLAKE2B e62dee23e0e92e087adbce7e37ee0e0f79f0ceaddbb0a701e78c17e7772fe611e0969f55614f049af10b688fc1ed2af4dc6d0aced35ea31bd1e3b045015dbfff SHA512 fa73410538d0576f596cc0595961183d81ff786f392a9a8dbaa8f269e16bbc968964be584d50d2170f18295c1b1a4a73514c7134a9d510e5cb2bbc662dc98659
-DIST thunderbird-68.0-en-GB.xpi 556407 BLAKE2B 764f6f0e8c81ccdbd5b1e2b362b18c2098b3dfe003afb9fc29f50cf6601d16cbf8d6823a62ee3795ee9a2fed593ed806d07d5c6ecdb373ae39534346d097211c SHA512 1bfe3e4ba5b7458656d96b9aff69c8bf33708f112616c87008081da5ef9c1295b224e828f5e738e1c729433ef2387ed8d9f09fcf4a479a86c73422dd50ae98a5
-DIST thunderbird-68.0-es-AR.xpi 596555 BLAKE2B 655546f97c74560c92071a5efb3c4c63328dbdf65951553fd4fc779c5f35f1865d5fe180e87991885f965444abeb3428c24a6f142baa38863fdbada4ef65929f SHA512 3b1e33d1f5bb76a0ea5f361f5d09624294eda230322bd350b1199e7d5ab691ce2a720e2c222bfc0244b537f695e8268529f69b5aeeab3ecdc356a7922e02a49c
-DIST thunderbird-68.0-es-ES.xpi 518355 BLAKE2B 6a1157a67f667260b6ec5e16320f9b04793be1a2efacaeb516f96d26aa1e247a3e519ea6c1bfea860df4f33ad25c0ae4db969aaeca2ebafc2629dd3d5f415c74 SHA512 3d24445196608d307a6aa4df261c1d4a6473f2bfb82530bdafdd0203587dccb38443e056abb14d735bf9d5ec1e022dc58e0b595c23c4e197195fbd4985200a50
-DIST thunderbird-68.0-et.xpi 573585 BLAKE2B 7ec4dc001da15c653f34f6a809e8ff6f9714013130545843aea23b8daad96a2d910416aeb22e67585e01442de81f433762e3251fc9fc0133d3d4c0de3068d174 SHA512 f540fe0ceab68782c781e81a43d1a425bbcdfa1af49f24113b6b30933cf86e9be7b3e8c34983a5f20311da29f4be90058d07b90297c06d886bcb580ff52fa0b6
-DIST thunderbird-68.0-eu.xpi 579949 BLAKE2B 132bd384dc626a26786b45e3bdd67bac278f9d31d3edcc658c707b3981e94a00303a2a79f10632706fa3394447e4941d71dcbc7563f02a44b678fd9f3a4adce8 SHA512 e2472954fd3b309c182f4359d4e34b029008441f4ec17cde94dd6e3ce97bbfc7a3c523f54ad7bcec5df1a4c36fa3190c8908416b6353fa069c50ec59d28e0ff7
-DIST thunderbird-68.0-fi.xpi 578422 BLAKE2B db7598b706edf7f28399a72a6b30f2f4ca75a4ac4af4e775086f93c39baeb70abd782b41e2034263e962ec24249b5d7256e2ffbc149e3200501bc600c2ddb57b SHA512 f61565baebe3fe086faf3f77724a27d2494bef6dff6d2c3592559a86871104484807d9760283eb6864c92207ceb12bd8d93f699da71ebd9a6aaaa48b729e40e9
-DIST thunderbird-68.0-fr.xpi 607814 BLAKE2B 7a12719e8a8418218b19655d71ca6727628f3841ee7ca857ee3b48926321b29d234863742968e0dfd82f0740ec2a1e92cd1d0b77b230161372cabf1f76deee46 SHA512 8ee94e558cd2854d5d3548f8808b56f4a7c81c57183278b823702499ae186ea2a9ddf91d2a9bc6d0a3b5cf70464a2e5827e8e26daa14ce30623f75d0d324f018
-DIST thunderbird-68.0-fy-NL.xpi 594471 BLAKE2B 6f7f9e5a8692efbcd8f487829fbfa7c15d6f330fa5799375f64a4992b16da299902c5bb20277e557ee775ef4b8f8e87b3ebf29b6823dc13a2dbed11af725fe03 SHA512 aa43427cb603bc5deab2c13cc8565aecc8e2bc505961c527e5eab2406868c0f798876501c9e3960bdffdbe4e13b1936a4b18bc728efb9413c3c67e91c9850384
-DIST thunderbird-68.0-ga-IE.xpi 588714 BLAKE2B f02c68d432e10d17a497fb08657ede02bbc1ee1e8c34b9c33ea315667241b9f8878558ddf98b4f3398f1dc77042cf501288681b527d92faed2148b3e5070ed29 SHA512 d3a71503480f5116e5224a7f9d46d2c5e7a96e2ae9bcc72db264fd89aaf14f85e3dd901fe8258c3f3cfce3a3f5fe8c1c9682eef08908bbd075374b0a9c56cc50
-DIST thunderbird-68.0-gd.xpi 587113 BLAKE2B 80b223cf0e2ce8fa45fb0d1d58a83c729c70a2058c8e115acc9773080c65c42ee8a2fef83572749c89abfb4fd9b73ddf7c4f599cc42e6b125f7d7a0f62346fd6 SHA512 34325901aab83cf273529c0039b9b1b66efc020f1e5f627d7e4b7542bef4fa1ce1bf072ebecd018350d8243929b76bede698157286bd1766472b733950b3853d
-DIST thunderbird-68.0-gl.xpi 568400 BLAKE2B 71c7dfd30cff2db1b8ae050bbe5e84dbf7af7bfdec7a344708ddcd08a9fd9af99c1970a3b38488593155c476e4c96172af389fc5f069157685a38cf89437c62f SHA512 0cce294684abe602884f39f06cdf9b757ce42424c1a85baaebbfaeb9db72d90f300706c3e1603d5fad147711d72c0b3e52295a4cd99145298bf3e71f94c0146f
-DIST thunderbird-68.0-he.xpi 604792 BLAKE2B 70e298a02f0fdaf532ef460e902aa104d97f2cf379367693ad7ca6c4846267cc56c479a8e9418661a62602a89e9282e5623fafa629ba7bcd204e541ecf1644c6 SHA512 aad7763b63011161bee42d8e1a8dddf118d3ea71b39d135cb049eccf97199ffaf2d10a8211ab1afcebaa2e3492672f98498da7e37eb197168e402964d3917dca
-DIST thunderbird-68.0-hr.xpi 583787 BLAKE2B af98f536e0cf26e2d949450efdcc79529056c38cd0eb267b2a3ab5ac5c895ca0ac97b0d78ea3853e03ac0eee51d2b0a45afe2cbe2850da17b7873608f0fa6f85 SHA512 ef327533082e6e8f35ecba996d0ae73c4d2e1f18d4dac7d323f7de2296394ad5ab26ecb2b996210c5d28319546d287addad74623ffed801ac548f8529624d04f
-DIST thunderbird-68.0-hsb.xpi 616039 BLAKE2B fedeef8593a328aa262985cd3982a1c23cf2e9da2f3ab119ef5424a71ca2fba23bc76d1534b682ef92212a58fef150266d3240ee934a53e8e5a8118b4203a41a SHA512 9254218b7628cdaf97af82239a05b8287cd3e07c01958a923d67a5f3b681f52c3ae96b8c33127b289f080eaf69e651218cfe9ebaa49f9c55303784658e79a4f2
-DIST thunderbird-68.0-hu.xpi 618159 BLAKE2B d215510661fbfc91345e3a4fab6bc97b22f2cc980c8b121c7403f2ecbaef75e9036f962316f0f4d1ff5afba20faac95f7e1efb205532bb6e25bc3d558b145cab SHA512 4da44d0f54ab8832e8eb5b4484fc06fb3bce0588fd0a4a01ebcc8f42f44c2600df368c7b9a7ecd55fb0473e6f1ce91fd26b6e6cf82f62d6f34c96345b4139027
-DIST thunderbird-68.0-hy-AM.xpi 630527 BLAKE2B fd238ef369849e74a4302dfd9835d9cfc7a9086182d2f06597a34a54b25d15b433b6f29472df25c638ba7722b597115f56f08b604c1e56354d07e6f0d1a0acdc SHA512 1884f9a7ee6ca9b5fd3104b446bc1779a5021de275ca245a7796dda487622ffb35f92b3693a48bcc9983bb79a82be700878546aa5321e29e7aaa7d63cb63362e
-DIST thunderbird-68.0-id.xpi 567750 BLAKE2B 829b7d86b6a7f486a0500fb76d8fe20a7de1e4e18cf2b817bdd23c6b3b26c3b518fb647c7d983be3812c59427700c1cabd1761a7c1428f8c3400dcc98d4eeb9e SHA512 e154cddeb48cbbbe090f42ae5fea785bca4086b753b6eecb958568a30c7970c761d672b164c970f2b06e6c446da34e5a70935e54c3886195b946b6c66dc1aac7
-DIST thunderbird-68.0-is.xpi 575444 BLAKE2B e1469a504c02d13c0229146c5e95dc411c7881a2dd73e3b83b32872526a8ced983e4c41f08efba7ca193027b9c4e3ef85e836303ddd889b35a87c676c654609a SHA512 e7fa884cea521f95f70840ab1e5c01ef0ae73c8c352b8201df95182864f2fb467dede7c1de5b8ee8a4b09212b1581f4e52fcc608e6463b581af0976a35c9685d
-DIST thunderbird-68.0-it.xpi 489522 BLAKE2B b48cf65017df7a97576d58e69c89e22e5d4b919a167a7cb11c942511150ae96fb7727e74ae053ce8192b93173c655ebd9d11c5befe331266d0b9ff48dd0f3eb9 SHA512 2242f359661904027afad7ca3edaa0af3e7ba2737b4e7a217efae55d3d7caae629dcd913945ae417de04197e70bc121370ddc92e11fd888dc57977ae803fde2d
-DIST thunderbird-68.0-ja.xpi 643578 BLAKE2B 86ea1d5494d69d5bf5c9ef33baf627c807f15b3da5fef79ade76a320e42bd163d2bf26bac8c3b58e103b4b68e5f729f281cc0a898a073e300069c26bc07b76bf SHA512 cbbf432c8f0eef14bd30d080187ed366c391ce98b963a7f413c2bcbf816a4c032c73daedd061cfde8088e6b8538a5286d74464762d56bfe709f737b4622dc277
-DIST thunderbird-68.0-ko.xpi 620532 BLAKE2B 640c4a4718e9fb75e4e57e48cc72e3ea69a59d45cb2755aeed44503bee1a6727615eeb06f46dec8aa10e98fb3a1ed27e70fc2b8b8e3bf47f342640c7b0c6ed64 SHA512 44b3714893997448cd6cb08793af861a434f1aedd9b52ff5ad4b461634fc8506958b2b4721cec906b623de91cd3fb948500f7d4633878c0331b7f98b529d4242
-DIST thunderbird-68.0-lt.xpi 603849 BLAKE2B f3ba5e2f40a4d4e1ed6819559248f65cd738fa35db56a3ca24eaa5a32721867abb28a16d61c1087f3397a8a63c01830cc1d35c0ce51d1487fb4d581241ddc7e1 SHA512 43cdc2e96c2d4897274c7e54efd64bb0ffc13f0ef7cd782937426df3f6f60d6bf45ec1f8e1f5a474b946c3a5c7e3ce055dae4d7526cc2462178d1f3f474145de
-DIST thunderbird-68.0-nb-NO.xpi 574024 BLAKE2B 95b409936005b7d94a3c1c54ea6b3032e47d4ffbee731b06e1dddee9e0077e4eded55ab3b76e1cfde619a6e4aed586a7f396c85db2026c358a1240f81f332320 SHA512 9dbf9ef59a3366d6901a30ef6511e41e32cb37d507c8867128394028f06f69fbd85de5d3fd7a1a3b1a18e60a40d91d66f569fcfa33c28f3de42f4a402a148e9d
-DIST thunderbird-68.0-nl.xpi 581358 BLAKE2B 35d574bbcb2348dcd864a9035d63189b0b5c6bca22b6123d04a234b7ee74a1542b80e9317aaaa83056ee435829284fd006d102ada8482bbd438721d55b29a203 SHA512 d421b341edda4a6fca9907df21a86a69d69f8c67a74fa8ccfa6eb9ed12971ffaca17ef28ce9002888d7dbccb99b29312a53277e29fab080009a0ebc0a67d4399
-DIST thunderbird-68.0-nn-NO.xpi 574952 BLAKE2B 15be15620ffbf34bf2149d1ebf9f7fa539478253a0ce06234cc011a5076efa4cd70f6739997cc131e300657bea2c91e9b4399b136da712ddebd1eb0f4cb81cbf SHA512 f2eb82d0364883d683e99c1fbc8d31ff7275d72a439859eb51b6e190c3411333f0102736ee206547d9578d4e6aa33f9ac7843c0b18ed2d4e1bb52cb5b4aa37fa
-DIST thunderbird-68.0-pl.xpi 576090 BLAKE2B aad0754f3e0d7ea994f71e46160d71bd54573a0765dc5978022f6255eb3f04cf28ec1ce7eafb2450c9fcfae3c0bb1897afb85459da9febfc6770458ff8421223 SHA512 73d931350b429fa61b822ec19fd169abeefbbf66dc496e2cc694763e28c2f3264996ca07deaf6819f91cc08e3fc11377e1a67dd98df5de2fcdc2e0ef053f35b0
-DIST thunderbird-68.0-pt-BR.xpi 589839 BLAKE2B 65402956dc9b102716c1ef7ffd2fdd9ac1236aa85aca8e5765fc8c720ae34b0bdab98077dc42fe1a6560c67fec5a06d62283b89217c1e5ff3c5fac2100e94313 SHA512 7a0d71960eb5d23bb1f5979d321c463cfcf8ebce5b60fc370e922468e8d3d4e95230549b447c32e70d75d39aa1a5b4ea2d793f423e1da8dc62a9a2be54796701
-DIST thunderbird-68.0-pt-PT.xpi 588106 BLAKE2B 741c7b0bedd2219bd8c274d1a192624c107344a0e8ce77c0f7a9f20db30d58a4519502cec617119d5fedd9ba1b47a2bd692762841c1654ab0bac28c314378aad SHA512 483d732c54bf516b9b06cdfaa48c246799ffa8cdb1dfb1fe67231a83abd0d2e5f5470133528f1fd297e6d961cff98404f6db3701bf48c48d25be7517e4965f0f
-DIST thunderbird-68.0-rm.xpi 578053 BLAKE2B 0864fd59d6a96a17f486a5570d69ea7e933e11225415357d02b11d01d3cfd24e9d627b312913fbb8a276d59aa504b875e1fdbfff987cf1ff8619ba74ee13484f SHA512 1bbe684e3a696103190d926dc1ec1e27453911b7267c36b87f615f1c97d6720513320f90992c48cd1293f37fd009f338da6c6832b49b0597af97d928058271c8
-DIST thunderbird-68.0-ro.xpi 594844 BLAKE2B a6ecaafcde838a1f2a6e33cfadc5f8bf2f6c873740677b9e0de75ee9c3b0b973f806407857ea27876f57149b1d7aadec31a9bb3216dfa494be52851c2ba66d1b SHA512 fa8c7e41fa9e15e2bb248fb2960221d3b5c45aae1e094593e7f7b03645d1a85d93de2d46002a2cf31a487e0d25079905372acbf22f9484bfe747a26ca90724f2
-DIST thunderbird-68.0-ru.xpi 683329 BLAKE2B 17b19ec36e586d4c515bd86a2dfa3041b5d6ddbe64c1e45d252eeecc9693bf6b70855f750960231eb2bef64e3a5f944b24f414f967634bc6c7b4024bdca293ab SHA512 ab70a04185bbcef1722bc6ac127289acce4bc6410c7732d3fe653d35d3a23b14eed9c51feed317efec47ffb5e8e560c3faa80550043beddff94be90c8be9ad9d
-DIST thunderbird-68.0-si.xpi 637408 BLAKE2B 5bd47ea8a09a76cb2aaf58e1e9acde919dad7de34cc86989cfe054689e13514f027061c36d2bf27122875db4c0406e759b72a8bd9117637af1bf60cfb6c6ee1a SHA512 1eb0f6728c205faee0c5e88c3801eda8f35a03e0fd5c20b7fbfa6c29aa2f804ef1d157342c17666b086c33305dbf53b706144b26b4172d6e8c91c782037f0d47
-DIST thunderbird-68.0-sk.xpi 609756 BLAKE2B 20d73444d2ae0abb41561cafff118a5a00451b7b52848c102801f9d4a860a8959ce969bf5ff1bea1e82dd909d2b853b2406d03742580ff2d74e684c00e25b137 SHA512 53f2fd7c22ee9381b38fa75290c65c57a452335944cb13cf710c064811207af2ffdbd11177f378d0cab6a5a5ac4ee3709b427f1c42b09ba3931bd73a3d503526
-DIST thunderbird-68.0-sl.xpi 590632 BLAKE2B 1cf13e500189398ce3bbaa495c0c1c69ed23443ec3fe3f96598ff3fd54b576715ca2d2c5691ac0c279b417effa1e4a477170ade32169ca93d932223642bf4a75 SHA512 b47d6ca7e6e110447e76f90d5e0d7ed23533da369a74578bb664c8a25539e4fd8583747fd4efa8ffafcfa5a01b2ed9c66c5a152fdd1f468ab2da00f6946078b6
-DIST thunderbird-68.0-sq.xpi 598904 BLAKE2B d34cda28594747e4a6ad699c071aebb599e3bb12bed97545dfb9baf3e852ec6c207e88dbfa553ab411e6d7ff5fc7b415c2f359e55102ef67e2fd42bed3422085 SHA512 7beafb5e1da2355866d4d14e38d6d0712fc6f10215a4923a941c1d1c775e79414b0ba58b647f79a4d36cf07c825d69e108d581c0ff2471a76500714499d9f57a
-DIST thunderbird-68.0-sr.xpi 624900 BLAKE2B 86950081a0b20b1db3df4c140fcdf1e9fcc3cbf8cf1287942a889dc6e18ccdb71e60e738f1e8968c265484166aea1fc6dec1398ad6377ae53c7d7753c812381f SHA512 f6b925a53e37ab50431a0062dd53171a1e59c5927c82706eea337d9eb7f3b03090bc383b1b8da5dddbbc67e3677962c0b1d79196ad839af7e7aa56cec73ea44f
-DIST thunderbird-68.0-sv-SE.xpi 591599 BLAKE2B c9ad5ffb39cca198da8b9ad3c9599c0be400d0eae6901c4acb82b9c71472ca78e4765fed1f85d2c1ea74fdcdd24670dce8340c392f1c71463e076566ee0c686c SHA512 24834d4e6a8badc3a4edf5d93e5a83249b96fff3cc9b918eae06c99457ae9ee399a2ac479ef3ab0cabb4d06dca44e56576913162dce643f725ecb051b5b6f283
-DIST thunderbird-68.0-tr.xpi 599711 BLAKE2B bb852ad1127ba445fd5f64f6b2cc90723cfc10a396915a73fc2c297872720abd9a166a6a24993fc08b5eb0d4ccfc8905e374886a13040e151e65e7921c584373 SHA512 83bcec20d0a137f5a7f480bfe3b05d32549fa7a4e07b449d96023a7b6b0b8a7e87ee0202de2a6e6b77e825ce048b021f27a243f7a8f6bce09fb0a8bd6dcc8306
-DIST thunderbird-68.0-uk.xpi 671458 BLAKE2B bd66d58c1a0770e4d4453d8b5d305943aa5012d365b4520670ee61cad1b569945bde7540a5747f66d6ad9cd56f8499e1111d90d2666d91b9149e7f34653f6f9d SHA512 55330dbd8bce9cdef80a081ab7219991e30da74a4e68eb7447c9a01f6a07db9f7fb12d2a7a826767cb70c112274c36119c9fe77f7896af9e2e28211bfc75f0e5
-DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8bcdc8f0f8c9a809211824fb0340be7ed7587eeb0c7bff27ced9b06f7f084a46d0d25354f0d5ea905bd7562625d701 SHA512 4fa2b202881d45680da6fed5e3c9332b64c6aa539e6f19f4568f06ec0819e7157392270a4009db2e45ba9815ce696a87179b2709839d68236405e88542892857
-DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d
-DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f
-DIST thunderbird-68.0.source.tar.xz 338451344 BLAKE2B 02e262b860076fe84adcfde2e208868576a48e63ceef4327e9a5196532e50c2a2b5069868d3b91d683373899257f377daf7a86d33eee1a0d4b8174e6eece2fea SHA512 91f82016b71d65b58c1383248ac6f7a8cd8217409323eb14e8aabf2e509391bba4d18e0aa6d0cdac191d10e9794977f22f509078b7c5e3ac7c22afe379a0f299
+DIST thunderbird-68.1.1-ar.xpi 617172 BLAKE2B 6f993edac7b6002602c28d42419ea94a7ffa8d8eca8b808dd904106c65cf1f3e20f9f5e69a605997be9b53dbbf8374f4120577ad7651c98332d40654cc1dd6b2 SHA512 fd40a8273777368ba6aec4f0bf6363cd223284fda5e56bd6611639bbfff1484313bde514c1f57c510b7d9cbbbca1995b7e802d2fdb769ce31d72be864efd60c9
+DIST thunderbird-68.1.1-ast.xpi 551304 BLAKE2B 6c581a2b3b225924ea3c9dbf9dc1469510ad760ae98a11598f498b8c158f2db91787fef76081fa8ae302894bbafa335f934fcf4bd8b95a6b527c52698831c689 SHA512 5cc2b589d7b4f5c5e00e09323417271cf08d505e12fc3b76cb9686d433bb0e7f2c4615e5f0f9d99edccd156ac63eab210037bce306cc1adf91b624b1a0eb0c3f
+DIST thunderbird-68.1.1-be.xpi 646286 BLAKE2B e1c3650d6033b9d684c728cfdad6834a6bd6c65b9d54bb5d36dd953ed12633e9cc610567eb25551a21822e5138d4e9add70d39011b8c7b396ad534767ab46996 SHA512 473615b00eba96ad530625d945d1eb997fe6c63264d5d6cfa0c54a359aef3ea3d41ece726388cae52514006156419aecc986803fe62d0e90bbd0185f1b90e617
+DIST thunderbird-68.1.1-bg.xpi 646232 BLAKE2B d0a7dd7972df80bb775b02c675c83944837a49c6ab60654a8c9d68a568272743ec1f5e96aead8c2c7bf1624e8d0b67574749739fd8f3e167532fc550cdf102e5 SHA512 073070545db4b3ea43cf2d87490873acd3d193c4657635600ea761cd90206ec7d0e77618a92524729391c0d36167945ac406be51f44e6b1711e830bcb2b2aecd
+DIST thunderbird-68.1.1-br.xpi 574857 BLAKE2B 15dac462709b24dbcc89d36fb5e4156a73f0d61a166fb470a0a98ca993004cc5be8bd2bd1d39fb0326820e682a3ad79484531c2f6027ae2a0ff78c97f0999b3c SHA512 a5e48e25e81d85082f9bf5e77d8788eb08c16473dd1bfa8d778bbfde5e36fa26c6194919f87f04d5ca50a8524c9ffc5027f708441eb3519ac1db4a5c8be546ec
+DIST thunderbird-68.1.1-ca.xpi 578444 BLAKE2B d6ce3e565b0b0f165f315c8b9fd7107e2f26fd02cdbedf2f42402ac7652505ed6c9ca6a6e2cdd7a743732a3abcbfec7dea99fdbe590603265b6a8caffe0fe94f SHA512 cdf78901cd803c4b3931bc5d93d64a444d92ac8d9979b92f8ae80a7e9316ce8fdd725ae647b7b1d6053c0bb72f9764b615bbfcb72de4e6c92bf3186bbec0130b
+DIST thunderbird-68.1.1-cs.xpi 603047 BLAKE2B d5512055f429ec6d2607c40e928a23b5712945f0a127abfb122111668482516fa81d6371c6abfebc43341d09a31bdd33caa126e8b79edd348faecbe88073a078 SHA512 d6908a99cf69ed5dcd90b4a3a7bf6ccffc2264c093f3626a41e4fcf95a6ce6c5900bbbe4657f02041c1a511474941d26f8bcc775ac8ee732c4e0eeb995a484bf
+DIST thunderbird-68.1.1-cy.xpi 589907 BLAKE2B bb2e827690f571d2d25b967f448e6737a36e9d634bae9253b034b29e3e6091820fc25c9e5c01ef0d1d623d7d4f514d878831215a6af1fc579abf453fb40319c8 SHA512 7c9a4a7278db44edbb407de693be56e223ea857be58a801b7ae1fc23996ca82a117e7cd405b3398fb1397497e0b927114ac77ce8149b0fbca4576aae97f10a21
+DIST thunderbird-68.1.1-da.xpi 588355 BLAKE2B 07c232302dfe6dc32080ee0f8acf653ff9df3b3b73d3a7c39059ac1681ca3513fa9b9502d62727f5cd70016b6f5d80a8f260db9a483b5838f9d3765cc4be279e SHA512 9cbd1b7b21f89d5b17f305efc6d09e733ba7dbc2e97028a9eccc1ec1b3836dc80a2a13c51ae1a1f65f8da32b4bd7802d43a6f8ffbe624a357efc64317eb0c050
+DIST thunderbird-68.1.1-de.xpi 597809 BLAKE2B 793d1c87744d49de27603fb1bf8890ec88f2aca3984a8962f0d7c8d0e150d1900c31ef0bbf5dda82d1e8650eb5d42dadc23e74a0f655e9b0cd52289249256f96 SHA512 8ec2df0f97f79d34344c07009a48ff85c656efb37f4dcd31696a35183f4dceb7d3b42d596ac724f0c20d4f8f35d077c69918cf029ae4cbf1434d9da51f370f5f
+DIST thunderbird-68.1.1-el.xpi 699227 BLAKE2B eb40fbd7c52261ee14cc3f00cd588fd74231ceb5603c8e20f106d9acdbc72442ccc4e5854b9e4dcfbe41bb37a95bbfaf2c110d42e6fbfe0b6c6410f8dfd20182 SHA512 2928575f630e6bdd7882c1b268f6586f5c34e9039c56c8ec3501f960c0f7bd0263203925d5a8abdf418c2e20cf969f4fa75cddb932c785abbae3eb207bf52e9b
+DIST thunderbird-68.1.1-en-GB.xpi 556408 BLAKE2B d7dfae4bbb1fd39ec05d77178984453bd52777bcfd044aa4755db6c425a3e1f6136e5444641f862e52fcf383cf2159febcb014310d27406f79ae6a022022f883 SHA512 610595806a5dd9495faf3d7ac09c4413724079dc54ab92eab251ba1b81fa4f2e9f9ef445930b49d2d163457a830d6ce25e1ad80986fe2e01ede119f9beb9778b
+DIST thunderbird-68.1.1-es-AR.xpi 596556 BLAKE2B f6b1567c75c6c470d262d6ba47168fb1987dfd3ed37e23d5737870f9c2e8b178ac7f8d01f7e6ec795c0b16083b0181b5a75a9a33d787e2e903108d044dda5cd5 SHA512 5a1a48d8abd5e1b0a1392bcbe14476a0d0c0f97c10079e7c7d67a2476e8eca6068d47706e95dd840658c24f97ca259693667731c8a192553aac5a8764d1a0ba8
+DIST thunderbird-68.1.1-es-ES.xpi 518356 BLAKE2B 87ac72254884bfed7682e45ce8e846fbd70fb0e635dbf86745298313783fe27ab3f8446429711b1820d18b671d9a1ec20dca8281e7c961d24da12eae2dfdf846 SHA512 381c1235d0494cc5561c0dc5bddb4211faa8bfc3bedb3fafb6961a57060d2d65b3733a57eaeefb0df846c653f65ada5d26a8d5901dba7389fb0d9dd2feccba7a
+DIST thunderbird-68.1.1-et.xpi 573586 BLAKE2B 0224f28e33b6ebd2609d1805377f2982669085e3dc1dc58f6ebce7d7a206991d906a42f40248c1f9fa58aae42b8a82c31f02e7e6d92995dd9f36425c3d37c60c SHA512 d59436d2ec58828303dff0138ccce6bb683d62130f6d1b7c652f1bd157379edcd8dcd1af2d6c9fbd297bc8c73a710cdf6f31552bd1501433a237106854ea81df
+DIST thunderbird-68.1.1-eu.xpi 579950 BLAKE2B b92afba24f4b6599ba9d8a4f1288b6d86210e2fe8dff15d5242c70a8cfdaa0f0f9a20739b171a815a3e50b6bed556e5a1e10cadabbf859748518f71172cbe40a SHA512 ad18dfa52dadf6c216d1e66364534204598b7c30176de8e2be48291044d4d89e109a2240c4cce9f580e55287c9ef84f8b754b96b5623e0dddb17ed725bf0bf93
+DIST thunderbird-68.1.1-fi.xpi 578422 BLAKE2B c1e9a3c4705fe6964a2f0aa3cea6ac02a616c0b0138a0d656879d5a6ea388a34cbb90d75836a048485e079e54c55fd27c09c9bc9aee59e899f57216e7de4c8f2 SHA512 ac95158d2e607af7baa12dd2ad3499803a417238ecb337ed35c57c556279c5d890201b0771c2c1061e337e2c93f2d928c4a3bf262e146a18fd4815b2ae38a5ff
+DIST thunderbird-68.1.1-fr.xpi 607815 BLAKE2B 54d54c57a1bfaac21687759ae4c0d0760c77b2132a479a017e69cdb4967d384933389e5bd81e4d9602486aa5b35c0f6530dc1e2f95c0dc8c175e4feb0d4fe139 SHA512 30cbf80d3812ee65ebab393606cb0a67a2ee798704f5ac5a4270b8d149e51c723688a88aa0e39943447a42dc0dc9b4c286dbac262494f29e1c495766d2e060e8
+DIST thunderbird-68.1.1-fy-NL.xpi 594472 BLAKE2B f29cc1235ce2564e7e7d365a34f01603102bc775162efffb87eea4210d3a01d50022ea2fcf39f6e81f2ce91c569c8898743eeb163dbf244a1e4d83c55f4cecc2 SHA512 000238e2d826bbd1d365b3d57b80f6a89433c79a6d34593ab37daf2f37147d56d8056482be362fe6c8a64ebc4dbe437141cf305fbdf56efc2f35f9fc568301a4
+DIST thunderbird-68.1.1-ga-IE.xpi 588715 BLAKE2B 6cef363a1e07e52a7ab7fa5a1974a12fceea6857191849da94f85a21992fef64d5cbdb9025ac5c559189e6e24eec4f1620c0041481c1f58d1efaec8a4b1c77f6 SHA512 f7ac2939fa1a7cfc64954614d50bc9b33a50ea956cee1aad656d482f51f37f85dbad1f5167ce0019fa6c9c97d3e290074ab67fb875948580065e2d23228670b4
+DIST thunderbird-68.1.1-gd.xpi 587114 BLAKE2B b24cd419592db23299699c7205f944ddd81e6963385a2368d2fc4e3d3865511fd3c9ac64a2b6417b7e074876c647af59931faae24fa485f2843164cff937383b SHA512 f97938b60af9c131bf4041a64d760e71e419a45deb512653aebc1b0b520fc8007d02fd7cdd834439c2092df41b2b671206f3cf21b0421feef3a59b38cc3944d2
+DIST thunderbird-68.1.1-gl.xpi 568402 BLAKE2B 523a77985a686e2d50addfa8f6359bf4b042bddb11e08c3bb4417404a7e7de2ad7a10539d5ef3f08fc4f51069692996bbf7cba4140f834ff095a7a4b8dda4799 SHA512 07b2a316ae336623533aaad43ff6977c3ba8684303814e18403839d1c588640ce7c38335e651739f8782ee7ae1e570b4571b5c1e3da2d61152fc1ea659b9132b
+DIST thunderbird-68.1.1-he.xpi 604791 BLAKE2B 498591948031e8ff3e35bd43b204b5c625cc40c39fdd17719d5e8dea869063a65a1fc89d17a06bf8df21c8c8717f63e8904f7e70283d3f6051ce97425aa4ddea SHA512 30b03adb9592a93031725830fb93aef0284b3ca783f3a8116cb4b692851a2fab01a0a34c0feb7297859b623188a6412425c146649579e91f7d1757a12c8c276e
+DIST thunderbird-68.1.1-hr.xpi 583787 BLAKE2B 9f50d7b343428cc4fdbf3c6151a4c03dbcb7e6d1d34a0cd6fc9d4a471c7e8538459856b677a1468a624e12fd0d99bf71c622a54886cd04d90fea4fa32b8f4028 SHA512 caab92d0583e426196c3aecd56aad30e5c94f79510a5cfdd1c749c44d35826881084889955ac6062e760fecc32eacb8904de397efdd5dccfdd496784784aa47d
+DIST thunderbird-68.1.1-hsb.xpi 616040 BLAKE2B 0830c95d3775bb8e3f148cbe5ba461c0b5c4c8f37c0f2228e9a363f8d15b444a402694346562bcf237c7657573711cae6bb44926081779d2c83ca1d50e437188 SHA512 7ad62fdde85d95d87a85e078f1ecd0cbbabbd0815c5112e7b435f1a048435b7a0129d03577afe3577e4003e01a826baf5b05b318bad688e30f0e6091bc7ed623
+DIST thunderbird-68.1.1-hu.xpi 618159 BLAKE2B f9444563732136bc56d217636becad19438c0ce617b7bd8eb08a0e59f78dd156cdf5a9bf30cbddc75d8cfd48592b8e1024f114e70cf6fd5001aee5a8c84346a5 SHA512 670e9c1ef1293501d035880e873128940197651538bdecf6fe17c09491d7f4512a56c53593235ce482fd08d4b4762da0856c23fc3a8e66aada5a2fd3e142b220
+DIST thunderbird-68.1.1-hy-AM.xpi 630528 BLAKE2B d9e05dcd502a01e201925bb3157bf49141ace42e031178c576b454e893f31cd825f1e769da5476ecc3e1f9c33f0e32e7edca8c7457fcdaa6c7ce98eecbeb58f5 SHA512 a00163028efd07b1cc66dead6129e0e54bdcca35c1859c79afc36b8cb9798745336e3bcde4116273115214be60c0387e5725a1d6b2789b073deeb4831c5736fd
+DIST thunderbird-68.1.1-id.xpi 567751 BLAKE2B 732d7e9e66e2c8bef201e6a2322a4336ed5a30d95e8e04ffe1f6ce5fbb7754cdfbfcdecae80ce9838949632c000070430fdb446860a45a8a282ccab752e2519c SHA512 ac128a74fd37a76f7d1aaf423934520dce8693f2220e4642de1d14f54008851a08ac9e839bad5d1d936d5e1d1eb7568672467f0acb93a88e59c8932ea47b7cda
+DIST thunderbird-68.1.1-is.xpi 575445 BLAKE2B e78cb641998485e7ffafb949f12fc1d36e2ef50e1608d898ec6aec136ac8b1548de1cdb600c3103b9385287cdf2ffc358d6d30a9a4e7f0781c837c5cba90bc7d SHA512 06aae8ee62ae3769dca5eb0e6e5e0d7693f682465d8f5b2eaffdaf1d09827a3dd0afaf91e6210f95962f67d5e8e9450df220ed16a691b458fe498bfc42f35e1e
+DIST thunderbird-68.1.1-it.xpi 489525 BLAKE2B 890499685d2ae57468da59b1249146f5f57041b69b804aab7b1d86016e0511f72f91d0d1b705e738b0579309715d1ac5234c50b59664316aee89c58096d7fa04 SHA512 02602cd24091ae565edf1a26aa5d4a64e5beea552f0c5db11549f99db1aa3c49bb94660b03538f2831c20de71ce723abe831d1bfc0fd912e4485283d077c1719
+DIST thunderbird-68.1.1-ja.xpi 643579 BLAKE2B 6b75859035fdcf0f24b64d075a7bfce3faa84bc8f24b71139bbd001e4c5d3f5335db02f67a930573302f89d4bf325cf7233e27812acea6d02a6a1639d10394fc SHA512 5f7924101c2c7603ea8684143fc7d4dffccf676613db760bbf465c9c50e77ae2d081fffb6dfc41864128f40f5ffcd52ad94ba61cd714cf42ca5926689bbc4149
+DIST thunderbird-68.1.1-ko.xpi 620533 BLAKE2B 663b540521b8aeb54772e8dc17bdde54625c0cdca598372b4374210ed2f20154d59b3168c63eb54fb4a84c8df2fd3cbe8f957ba95721fa2479b038d89e20fa0b SHA512 7d07ea02b4acdfdf1fd1085a02b63ad8a07d879da127e5df231de14e26c6869c8a6826b173379328a0d4886e0590389bc83b25092183b8e044d6b0b606fb8f96
+DIST thunderbird-68.1.1-lt.xpi 603850 BLAKE2B 1661ad84bc58a62b1df93c9fa87e32aaaedc71925accec87b416052f9be974efc85dabdaeea0aa804def2e1156b3382276e7bd06485875e0482250188b3dffd5 SHA512 16d3316d9a6422f76e6470affac49ee8d97953a77572ad322891e0b81affa7610729f7d20816617013b39abf2d663473a30a0ed1969d9c365f89742aa5009752
+DIST thunderbird-68.1.1-nb-NO.xpi 574025 BLAKE2B 464cc60845bac70e5ed301197bbddfa1e19b0194662e62b499832165a1cf87c637e2001e60deedfc8dabf644e4d918b63c0b007a95f098e8b790f96ab8261277 SHA512 434559ef3d76839b8a006ab131dfb47179ee50835e8cc0ced45278e5016aa8ac057cbcfb9602eeec7475e530d5bce1618a8371d8b2cd5c0ced77b469bc01f8cb
+DIST thunderbird-68.1.1-nl.xpi 581359 BLAKE2B 205cb9b5fc8c471e37cce555d11f47636c508e9db0a2d9bfd22ec715a2eb03385035fc9850b31266b80719333ba91cee2db072caf68fd73c98ec00fdc4f00104 SHA512 2e6121e1426ae2ccdefdc74cbb12793d221b5efb690ce1b9a7967b0f8d7a7db2a81e85f20dc6b52d2e704417402ed9067622e605edf952a92f7f165d958a928e
+DIST thunderbird-68.1.1-nn-NO.xpi 574954 BLAKE2B bf779b43ff49f4ebb80170dd96253b6e2c64419c90728a37cc381191729592e212f74bb7a8ec115917db3fe5e5e94e669eb6ab0c690420978484d33af9bf5983 SHA512 2cb0c816caf93032da35ad203128d15964b41304d81c97f03d25e99d0e9710aeeddd4e97e918b4a2a60617d3ed60218d6e4f360a2c5ff9e8b305e6fc4263d9b9
+DIST thunderbird-68.1.1-pl.xpi 576089 BLAKE2B 2863632067d9e72206a3f9077f565f7cc1d3a638872d74ca2439d42964b9a9eb9c774b1725f7b509fa314255ae74520f3b833e7799c0aaea6b66685b0289ac5b SHA512 055119073e0422bcc4290b27835fce7b9bb5fd625409158b1154ae637e7e9e239a3ef636cf49cc7886fe4edc425ba56a391915cd9921f332f0c441355f79741f
+DIST thunderbird-68.1.1-pt-BR.xpi 589840 BLAKE2B 3330c16a9cdc57eba4efb02d1c83162fd84d3f084194e5e91562a26291d951f82c6e8f72b0c4d5582009ab7716bae056388a63a5e4f72e009c202ca084c65d32 SHA512 6719f2ebb7e243d5bba3cbec4835b8794fe4897071f1e99d2bd944fd4f42b228d09afb4da196b89c858cc059c0e7b02bbb06a6a942dc7c47117a40dbbab77a6c
+DIST thunderbird-68.1.1-pt-PT.xpi 588107 BLAKE2B 5ba7bc94bbeb02fc3e96480e657fc0dbf8dc65b8a5a7095907c51633987fa33282b6fdeb032992df740e73dbc9ae778cb2f093db6cc164e4514c6d968dbd2dc4 SHA512 af3edb0e8c69ba206f22b2a3b9909e12153dc916a3b19a6c61772f8442f2e965e1757020778c8aeba446acca02b3a45b49efa75f3a9e3e778a75da2275bc98a3
+DIST thunderbird-68.1.1-rm.xpi 578054 BLAKE2B 923d82ddc57c3fe1010266ed37f19674c96d355f7232bcc075afbd65cc85efca2a8ab607b919887f489310320142909463af65bffda812616bad3818767de89c SHA512 7dba955bef13fedb85e57e5bce0ea0f64278265e7c288ebb4a71cbbb9f185aae30fcc7150e125c49e35b90a5508e967f52ebcf5dcea85ad2e119763fb9df7821
+DIST thunderbird-68.1.1-ro.xpi 594846 BLAKE2B 0b700444fab813710de5c6f24bb81f3f9c30c5fb5178fb9f13b14cd97961e89a16e3aaf9bcfa87a4973814cb51ddf93e7b547862869aee8a6daa7dcdfd6db6f5 SHA512 36d5fedd8187a721a6bc828c787e1ff641cfcce2c83093c311568855edea441fdf4f3e1b8aa69dc489735a8bef139fe685701af458bc3cc9b79c94b1330dfce0
+DIST thunderbird-68.1.1-ru.xpi 683330 BLAKE2B 88bc6869ca9137202b87554e87cea52a5774d7db529316e76eaec83f7adf2952062c320b631efa132f3f2c1ccabbfa5177417737f3bcff5c46f43bfecbddcfe8 SHA512 5dad9645fe962fb774baefc3231c2594fc3a1877a1301edf59d6f2016aabc7a03e168594266d4a95a72c45cde5886cd8049905ee49277066b1c3f1da3bba875e
+DIST thunderbird-68.1.1-si.xpi 637409 BLAKE2B ea91018652248c74bfc5fa10bec2598d54e9fcc52fa3305c899f5fbc2653419b1af8755c22059a1179253f1ca80135d7890d2b2daf219e00d66a4edd7a8f1d2b SHA512 f4b1d3b95acb77e0d1000a8f2d68392e1faf40c6ab8e30537b8da318d8aacf347baa8893455ce266f8eb7fc27b6c05e059c5797b125cd3d836ed0dba0d5de545
+DIST thunderbird-68.1.1-sk.xpi 609758 BLAKE2B 61e7cf155bb64d122d85814956f7110b0c85dd1d21377c8be5026801c4b36253526be45eafc1633e23272196420e0d00b91c3604d5259e9566390ef6e09f8ffa SHA512 eaa8fde11e22857246dc2e90640548bb4a625221f03cc2ab7061857418028c4d83786e2536b06af8c6bfc4ef529360c86a36d93a0f101b5057e77df7cf0b18ea
+DIST thunderbird-68.1.1-sl.xpi 590633 BLAKE2B 71c470c581100bf2306f6aa46fbb98f8324580b1ac1d6240342fc5f6e718fa43bb69286143902d331865d0d8e0a7929fe88a1e83e29d20737720b7a8193cc836 SHA512 b52d7396d50f36e9ca8d02a1038834685acea791d7a7480bfa7ec72124166c5835b420839de8e5555a8e71b3b5413925b6babb483ff6d1da25852677d3525f59
+DIST thunderbird-68.1.1-sq.xpi 598905 BLAKE2B 62c9448befb69ee0d155c851eb39093bff69ca86ad354fdd5fa9ab270b8eb47ea0c42d0d21fc1ee9060cee42da087fb2e77b6cdfacf00d23484a3b9263973267 SHA512 64c80bfbb8c4571daedfee814b98dda619962c9b45eacd22bdcefe3c5fa996f35b593543373674d66276f2e5a8dbc5e259fc7e2cfa5fae848300889e4293ac6e
+DIST thunderbird-68.1.1-sr.xpi 624902 BLAKE2B 85c39299c296c6cee8cd34c557bcba8ec0eb45a7233a4726ac7db98e84519c3dc48ec034d34611cf99a7600a32e0f5dbb0c42fe617a40ec6e0905c7fe940f017 SHA512 9dd447a4bee21383f7c735b18e9e211762f878065936c1f0f271c324a27ab9e3898f3811541f9b5c50f000eae6117f161fa54ce1a8819d924d7ca2b288063bcf
+DIST thunderbird-68.1.1-sv-SE.xpi 591601 BLAKE2B 60364caa021c114daccf3d44f9252383160171b8bd3ea30b0cec013d560ad546ec6bf0a1d2caec76da0109051696ca52242413d22e165540eb9e030f54c5cf91 SHA512 95d339ed36e6ef7a6ac3c615e73d878ba7d44f785c68d8a0da480c162ddd53eb7e9625dd13d5dfc9a1395a9a8b3c07ec39ed995a23b97a6cd8b5824fcb48e9a8
+DIST thunderbird-68.1.1-tr.xpi 599712 BLAKE2B c9340e9ef2c5f03544e455df04d6c75778cd05b396b206d4ee5b9f6b3f6526f86af29c2befdba403abb08dfa752fc27b4777f5a1db0f4fb733f2d3213bacdeb9 SHA512 c75f65175db0fa6a501ce2323cd2447abbdc60fc564e4310e9275fd8e58f0546c9cd65c77df95ca45ec9acb42e1d777d90b2ddde08b08a554dd16749a42e74b8
+DIST thunderbird-68.1.1-uk.xpi 671458 BLAKE2B d5c719a14cb8c52e513836b96187cb7199e87eed0958c3a34edff293a2ce0a5116b9a39ea0e2b3770deb95521f76c678b2df83eb245e9dec62d86e499190a2d6 SHA512 3d9e11b02508979b526b74dd2b395d9a82b82d61efe66e1adcfe1d566b48b7523450fa1fa8c06f8f643cb19dfc47fbf22bdccec68c59c8a39d10b4a607034aed
+DIST thunderbird-68.1.1-vi.xpi 623427 BLAKE2B 20262f7cd6d9adfcdf7cb60877ed804e41e61f4117bac907959bbd6dcab558621ad4929723ea36e5cd70322711cabf82f1e5e142e4deb409329dc63fdd48629d SHA512 896baa8a5eebc9c4465418b611ad08b8a3eefb602cdaf5439eebcddb8f02176861bc714da734f1ccd1f11c5df8989375ada14c06d5643ddd97bf5108d0eec8b3
+DIST thunderbird-68.1.1-zh-CN.xpi 626823 BLAKE2B 8959e8fe1de04a3115850b265b398b58dba6c66bd887cce3f3c1913f4bb40e0850b8a646357a4d751e5d2875ffa270c3e007e064b0064e4e429cfb2ced6a3649 SHA512 5ced7ce8bb8df9d76522cf6cf97ea0df5d54895cd7f5d1c35a0414ae30ff01da45796e6f0d48afdf875b830c0dc806343a73512d258dbc07d26875efe2ed89c9
+DIST thunderbird-68.1.1-zh-TW.xpi 627480 BLAKE2B 760922a766577238071ac9b0dd05e11cc34ca0d702533a67e1867cd4e98f3e20611c0fd2187f3c2a941c63eb2cf9d5514fb993bd9b69015d00a521abb5ba5af0 SHA512 e5ba5240e15e880099114ef913a3b3efbf3a966c6bcf33d4a03d9b8fc77e281fb58d5f672761f2831010003fccb09b304d4a9b3fd7e2dd142cb4f6b06084628e
+DIST thunderbird-68.1.1.source.tar.xz 330615656 BLAKE2B 7d34c19a26f383c616cbe15e0f32c367a390e68e87853863aae108e85a26d37ec610a0cfe0ece2f80ad67c94306dc3837a0ddbfc72d3ce7e989f0862549f5171 SHA512 946b9694c93bcd416fb2fe1f2448c7304d97a9b8dada9921ea5790cac019b0a53da2666eb974eb416bffd9f7874a51650563daa4dee97fef1091ac3b8df3f2ac

diff --git a/mail-client/thunderbird/files/mozilla-bug1554949-linux-headers-5.2.patch b/mail-client/thunderbird/files/mozilla-bug1554949-linux-headers-5.2.patch
deleted file mode 100644
index 2de1250..0000000
--- a/mail-client/thunderbird/files/mozilla-bug1554949-linux-headers-5.2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1559048542 0
-# Node ID 03fe96d5969ac6885ca539bf7759780ed75a1375
-# Parent  e6cf9d0df0793e7f76cb2877989fc5aeca98e530
-Bug 1554949 - Fix WebRTC build failure with newer linux kernel. r=dminor, a=RyanVM DONTBUILD
-
-Recent kernel commit[1] moved a bit the define for this constant. This revealed
-a missing include in WebRTC.
-
-I filed this upstream in:
-
- * https://bugs.chromium.org/p/webrtc/issues/detail?id=10677
-
-And sent a patch in:
-
- * https://webrtc-review.googlesource.com/c/src/+/138270
-
-[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0768e17073dc5
-
-Differential Revision: https://phabricator.services.mozilla.com/D32809
-
-diff --git a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
---- a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
-+++ b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
-@@ -56,16 +56,19 @@
- #if defined(WEBRTC_POSIX)
- #include <netinet/tcp.h>  // for TCP_NODELAY
- #define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h
- typedef void* SockOptArg;
- 
- #endif  // WEBRTC_POSIX
- 
- #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
-+#if defined(WEBRTC_LINUX)
-+#include <linux/sockios.h>
-+#endif
- 
- int64_t GetSocketRecvTimestamp(int socket) {
-   struct timeval tv_ioctl;
-   int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
-   if (ret != 0)
-     return -1;
-   int64_t timestamp =
-       rtc::kNumMicrosecsPerSec * static_cast<int64_t>(tv_ioctl.tv_sec) +
-

diff --git a/mail-client/thunderbird/thunderbird-68.0-r2.ebuild b/mail-client/thunderbird/thunderbird-68.1.1.ebuild
similarity index 98%
rename from mail-client/thunderbird/thunderbird-68.0-r2.ebuild
rename to mail-client/thunderbird/thunderbird-68.1.1.ebuild
index f350154..5ba8241 100644
--- a/mail-client/thunderbird/thunderbird-68.0-r2.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.1.1.ebuild
@@ -21,7 +21,7 @@ sv-SE tr uk vi zh-CN zh-TW )
 MOZ_PV="${PV/_beta/b}"
 
 # Patches
-PATCHFF="firefox-68.0-patches-11"
+PATCHFF="firefox-68.0-patches-12"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
@@ -31,7 +31,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 MOZ_P="${PN}-${MOZ_PV}"
 
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=9
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.mozilla.org/thunderbird"
@@ -120,6 +120,15 @@ DEPEND="${CDEPEND}
 	>=sys-devel/binutils-2.30
 	sys-apps/findutils
 	|| (
+		(
+			sys-devel/clang:9
+			!clang? ( sys-devel/llvm:9 )
+			clang? (
+				=sys-devel/lld-9*
+				sys-devel/llvm:9[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
 		(
 			sys-devel/clang:8
 			!clang? ( sys-devel/llvm:8 )
@@ -228,7 +237,7 @@ pkg_setup() {
 
 pkg_pretend() {
 	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
+	if use pgo || use lto || use debug || use test ; then
 		CHECKREQS_DISK_BUILD="8G"
 	else
 		CHECKREQS_DISK_BUILD="4G"
@@ -246,8 +255,8 @@ src_unpack() {
 
 src_prepare() {
 	# Apply firefox patchset then apply thunderbird patches
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
 	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}/mozilla-bug1554949-linux-headers-5.2.patch"
 	pushd "${S}"/comm &>/dev/null || die
 	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
 	popd &>/dev/null || die


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2019-08-30  1:41 Jory Pratt
  0 siblings, 0 replies; 10+ messages in thread
From: Jory Pratt @ 2019-08-30  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     323f418adc807e12d3fd5a8b10c2983f2f3c4bc1
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 01:41:11 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 01:41:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=323f418a

mail-client/thunderbird: more code fixes in 68.0-r1

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 .../thunderbird/files/disable-auto-update.policy.json       |  5 +++++
 mail-client/thunderbird/metadata.xml                        |  1 -
 mail-client/thunderbird/thunderbird-68.0-r1.ebuild          | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mail-client/thunderbird/files/disable-auto-update.policy.json b/mail-client/thunderbird/files/disable-auto-update.policy.json
new file mode 100644
index 0000000..f366220
--- /dev/null
+++ b/mail-client/thunderbird/files/disable-auto-update.policy.json
@@ -0,0 +1,5 @@
+{
+  "policies": {
+    "DisableAppUpdate": true
+  }
+}

diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 4a67d29..dd47259 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -21,7 +21,6 @@
 		or LDD linker when using Clang</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
 		for faster binaries. This option will double the compile time.</flag>
-	<flag name="screenshot">Allow to disable screenshot extension in global profile</flag>
 	<flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
 		and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>

diff --git a/mail-client/thunderbird/thunderbird-68.0-r1.ebuild b/mail-client/thunderbird/thunderbird-68.0-r1.ebuild
index 51e3175..10755b9 100644
--- a/mail-client/thunderbird/thunderbird-68.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.0-r1.ebuild
@@ -41,8 +41,8 @@ SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
 	+gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
-	+screenshot selinux startup-notification +system-av1 +system-harfbuzz
-	+system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx
+	 selinux startup-notification +system-av1 +system-harfbuzz +system-icu
+	+system-jpeg +system-libevent +system-sqlite +system-libvpx
 	+system-webp test wayland wifi"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
@@ -595,6 +595,7 @@ src_compile() {
 }
 
 src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	cd "${BUILD_OBJ_DIR}" || die
 
 	# Pax mark xpcshell for hardened support, only used for startupcache creation.
@@ -618,19 +619,19 @@ src_install() {
 	# force cairo as the canvas renderer on platforms without skia support
 	if [[ $(tc-endian) == "big" ]] ; then
 		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"{BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
 		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"{BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
 	fi
 
 	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"{BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
 		|| die
 
 	local plugin
 	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
 		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"{BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
 			|| die
 	done
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2018-12-03 20:15 Ian Stakenvicius
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Stakenvicius @ 2018-12-03 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     110e670822259aacc20f6c50ad99193db56226a3
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 20:15:09 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Dec  3 20:15:09 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=110e6708

thunderbird: sync 60.3.2-r1 from gentoo repo

Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>

 ...zer.patch => thunderbird-60-sqlite3-fts3-tokenizer.patch} | 12 ++++++++++++
 ...hunderbird-60.3.2.ebuild => thunderbird-60.3.2-r1.ebuild} |  9 +--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
similarity index 89%
rename from mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch
rename to mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
index 4e45b13..48ebbf1 100644
--- a/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch
+++ b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
@@ -11,6 +11,8 @@ tokenizers enabled by default. This allows to use system SQLite in
 distributions which provide SQLite configured in this way (which is SQLite
 upstream's default configuration due to security concerns).
 
+Requires exposing the sqlite3_db_config symbol in bundled SQLite.
+
 Disable no longer needed setting of SQLITE_ENABLE_FTS3_TOKENIZER macro in
 bundled SQLite build.
 
@@ -27,6 +29,16 @@ bundled SQLite build.
  # Turn on SQLite's assertions in debug builds.
  if CONFIG['MOZ_DEBUG']:
      DEFINES['SQLITE_DEBUG'] = 1
+--- a/db/sqlite3/src/sqlite.symbols     Thu Nov 29 19:08:28 2018 +0000
++++ b/db/sqlite3/src/sqlite.symbols     Thu Nov 29 23:02:10 2018 +0000
+@@ -45,6 +45,7 @@
+ sqlite3_create_function16
+ sqlite3_create_module
+ sqlite3_data_count
++sqlite3_db_config
+ sqlite3_db_filename
+ sqlite3_db_handle
+ sqlite3_db_mutex
 --- a/storage/mozStorageConnection.cpp	Thu Nov 29 19:08:28 2018 +0000
 +++ b/storage/mozStorageConnection.cpp	Thu Nov 29 23:02:10 2018 +0000
 @@ -679,6 +679,10 @@

diff --git a/mail-client/thunderbird/thunderbird-60.3.2.ebuild b/mail-client/thunderbird/thunderbird-60.3.2-r1.ebuild
similarity index 97%
rename from mail-client/thunderbird/thunderbird-60.3.2.ebuild
rename to mail-client/thunderbird/thunderbird-60.3.2-r1.ebuild
index 315316c..b50bc92 100644
--- a/mail-client/thunderbird/thunderbird-60.3.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.3.2-r1.ebuild
@@ -199,7 +199,7 @@ src_prepare() {
 		|| die
 	eapply "${WORKDIR}/firefox"
 
-	eapply "${FILESDIR}"/sqlite3-fts3-tokenizer.patch
+	eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
 
 	# Ensure that are plugins dir is enabled as default
 	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
@@ -474,13 +474,6 @@ src_install() {
 			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
 	fi
 
-	# dev-db/sqlite does not have FTS3_TOKENIZER support.
-	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
-	#if use system-sqlite ; then
-	#	echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
-	#		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	#fi
-
 	cd "${S}" || die
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
 	DESTDIR="${D}" ./mach install || die


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2018-08-15 17:18 Ian Stakenvicius
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Stakenvicius @ 2018-08-15 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     6670f259805fbef656e12739f4ab82ed1515486f
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 17:09:26 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 17:09:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=6670f259

thunderbird: sync v60 ebuild with tree

- fix pref to ensure OS locale is honoured
- use patch tarball instead of files in FILESDIR (due to file size)

 mail-client/thunderbird/Manifest                   |    1 +
 .../files/tb60-build-gdata-provider.patch          | 1473 --------------------
 .../files/thunderbird-gentoo-default-prefs.js-2    |   10 +
 ...bird-60.0.ebuild => thunderbird-60.0-r1.ebuild} |   10 +-
 4 files changed, 16 insertions(+), 1478 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 96e86b3..2e1e844 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -97,6 +97,7 @@ DIST thunderbird-60.0-lt.xpi 605439 BLAKE2B 4c4628ba2d25319b01b4c6d2d674d6ba2af0
 DIST thunderbird-60.0-nb-NO.xpi 578233 BLAKE2B f6106c0ff2346c65ab3fdc94d2995dec5af7459ec7785ea888d9ec7cc1861bd3e422ba13b4f51c506e880b42bb0ba05d5ef0f95dda12474a20ad7cc37de46cd5 SHA512 58a157b886bbe12ed4eb4d0d3cfbb57af1007bab9dfdad2d3640323e0f730d4267245f1fcb61259a3f34382989ba0b52baba2de287db23a982f91ebcc218e9ea
 DIST thunderbird-60.0-nl.xpi 583912 BLAKE2B 8bd178f8d3a947eec9034ef578f164b0bd69575d3769a5e28aaa1cb2dff0aa73bfb365c795251f48e46177f9c0b2ffb69df2a59d6b5952d510f8c1623a313bd2 SHA512 c3145fb0f7a83b67ea4c195823b08db5ad4ad1a41c36c53c7ab7339c337d161739c72e98f1aeb6a60641f220b6ad8e20b8fb9141740102a6da7bb7677a7f9df0
 DIST thunderbird-60.0-nn-NO.xpi 577653 BLAKE2B ccf638bf16de4f6b625d62db6ba299b7691098ed7fcebef026824b5ec04984793079ab1154bdf0aa8e67353d3ba560cd1a83f1ab3b178056509fb983757ffa8b SHA512 5188a0fa1102bc0fc92970a4986de731deaca358abebb92c1ae153d6a2db2193578c3d6d533b48490e1efe2d51652db5aed2401ad4a2a6186b319251afec78c5
+DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa
 DIST thunderbird-60.0-pl.xpi 480724 BLAKE2B 2cfd0ed35e23f2b5aee177ba0c115865d3c8988e6626210f21fb178701313ade1bf5be15ba4076c503c2f3d3bc2e2303681fbbdfe32483665855bd490a838301 SHA512 66ce0bdfbeca840a39a78b5be56be56684bec409509d543b42b98e775012c1e620e640867163473e5725fb8f16d95c73146120d6089b9a7a68fde22265a4241d
 DIST thunderbird-60.0-pt-BR.xpi 585017 BLAKE2B a0a830f012ec2b7bd703d611332a72b6e57c58de34fd5ab381a84af21b10237b19ee3e6250dca33b92ba0525e3f19487a3d45d79914f3cb6ac73f5c57c768968 SHA512 ae9d59d1e30858560c134b7a82d2e5550a66ea6f0b131688e55a7b29646e5df74f10d9e2e4e55a241dabfc52c2314385d357b192b4fb7cc86a86969cb1ebf37c
 DIST thunderbird-60.0-pt-PT.xpi 593185 BLAKE2B cd4bd6a1629af2cec48a4e667f4ae034a5e334848fbdc272b5129d2cd343a1e9a7f38e37a69224e448c19224047cfa41ea0bb7b538a2d4234ad623080ab4e4b1 SHA512 fb155832962516b396ac7574515c9223622601efc0a73e75aff20efb76d1aef6d44918bb24314f6f6e0b45ee826e12920a749f94b805739d7bc7e0310a8bef83

diff --git a/mail-client/thunderbird/files/tb60-build-gdata-provider.patch b/mail-client/thunderbird/files/tb60-build-gdata-provider.patch
deleted file mode 100644
index 6323865..0000000
--- a/mail-client/thunderbird/files/tb60-build-gdata-provider.patch
+++ /dev/null
@@ -1,1473 +0,0 @@
-
-# HG changeset patch
-# User Geoff Lankow <geoff@darktrojan.net>
-# Date 1533166138 -43200
-# Node ID b3975c8d27c10bfad83b9af956fea2bb43045b1a
-# Parent  00325311f1a5d6e8d27a4364c1792232f52995bf
-Bug 1471326 - Build GData Provider with Thunderbird and re-enable its test test_gdata_provider.js. r=philipp
-
-diff --git a/calendar/lightning/versions.mk b/calendar/lightning/versions.mk
---- a/calendar/lightning/versions.mk
-+++ b/calendar/lightning/versions.mk
-@@ -7,18 +7,16 @@ THUNDERBIRD_VERSION := $(shell cat $(com
- SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
- 
- ifdef MOZ_SUITE
- LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(THUNDERBIRD_VERSION))
- else
- LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
- endif
- 
--#GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
--
- # For extensions we require a max version that is compatible across security releases.
- # THUNDERBIRD_MAXVERSION and SEAMONKEY_MAXVERSION is our method for doing that.
- # Alpha versions 10.0a1 and 10.0a2 aren't affected
- # For Seamonkey, 2.17 becomes 2.17.*, 2.17.1 becomes 2.17.*
- # For Thunderbird, 10.0 becomes 10.*, 10.0.1 becomes 10.*
- THUNDERBIRD_MAXVERSION := $(THUNDERBIRD_VERSION)
- ifneq (a,$(findstring a,$(THUNDERBIRD_VERSION)))
- THUNDERBIRD_MAXVERSION := $(shell echo $(THUNDERBIRD_VERSION) | sed 's|\(^[0-9]*\)\.\([0-9]*\).*|\1|' ).*
-diff --git a/calendar/providers/gdata/Makefile.in b/calendar/providers/gdata/Makefile.in
---- a/calendar/providers/gdata/Makefile.in
-+++ b/calendar/providers/gdata/Makefile.in
-@@ -1,33 +1,28 @@
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
--XPI_VERSION = $(GDATA_VERSION)
-+XPI_NAME = gdata-provider
-+XPI_PKGNAME = gdata-provider.$(AB_CD)
- XPI_EM_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
- XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
- 
--DEFINES += -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
--           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
-+ifdef MOZ_SUITE
-+LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(THUNDERBIRD_VERSION))
-+else
-+LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
-+endif
-+
-+GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
-+THUNDERBIRD_VERSION := $(shell cat $(commtopsrcdir)/mail/config/version.txt)
-+SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
-+
-+DEFINES += -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
-            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
--           -DCOMM_BUILD=$(COMM_BUILD) \
-            -DGDATA_VERSION=$(GDATA_VERSION) \
-            $(NULL)
- 
--ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--# If the macbundle dist dir was already created, sync the gdata provider here to avoid
--# the need to make -C objdir/mail/app each time
--tools repackage::
--	[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -a $(FINAL_TARGET)/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/extensions/$(XPI_EM_ID) || true
--endif
--
--# stage the extension for use in packaged tests
--PKG_STAGE = $(DIST)/test-stage
-+include $(commtopsrcdir)/calendar/lightning/lightning-packager.mk
- 
- stage-package:
--	$(NSINSTALL) -D $(PKG_STAGE)/extensions/$(XPI_EM_ID)
--	(cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/extensions/$(XPI_EM_ID) && tar -xf -)
--
--include $(moztopsrcdir)/config/rules.mk
--include $(commtopsrcdir)/calendar/lightning/versions.mk
--include $(commtopsrcdir)/calendar/lightning/lightning-packager.mk
-+	$(PYTHON) -u $(MOZILLA_DIR)/build/upload.py $(DIST)/xpi-stage/$(XPI_PKGNAME).xpi
-diff --git a/calendar/providers/gdata/install.rdf b/calendar/providers/gdata/manifest.json
-rename from calendar/providers/gdata/install.rdf
-rename to calendar/providers/gdata/manifest.json
---- a/calendar/providers/gdata/install.rdf
-+++ b/calendar/providers/gdata/manifest.json
-@@ -1,41 +1,23 @@
--<?xml version="1.0" encoding="UTF-8"?>
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
- #filter substitution
--<!-- This Source Code Form is subject to the terms of the Mozilla Public
--   - License, v. 2.0. If a copy of the MPL was not distributed with this
--   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
--
--<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
--
--  <Description about="urn:mozilla:install-manifest">
--    <em:id>{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}</em:id>
--    <em:version>@GDATA_VERSION@</em:version>
--    <em:type>2</em:type>
--
--    <!-- Target Application this extension can install into,
--         with minimum and maximum supported versions. -->
--    <em:targetApplication>
--      <Description>
--        <!-- Thunderbird -->
--        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
--        <em:minVersion>52.0</em:minVersion>
--        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
--      </Description>
--    </em:targetApplication>
--    <em:targetApplication>
--      <Description>
--        <!-- SeaMonkey -->
--        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
--        <em:minVersion>2.49</em:minVersion>
--        <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
--      </Description>
--    </em:targetApplication>
--
--    <em:name>Provider for Google Calendar</em:name>
--    <em:description>Allows bidirectional access to Google Calendar</em:description>
--    <em:creator>Philipp Kewisch</em:creator>
--    <em:contributor>Mark James (http://www.famfamfam.com/lab/icons/silk/)</em:contributor>
--    <em:homepageURL>https://addons.mozilla.org/thunderbird/addon/4631</em:homepageURL>
--    <em:iconURL>chrome://gdata-provider/content/gcal.png</em:iconURL>
--  </Description>
--</RDF>
-+{
-+  "manifest_version": 2,
-+  "name": "Provider for Google Calendar",
-+  "description": "Allows bidirectional access to Google Calendar",
-+  "version": "@GDATA_VERSION@",
-+  "author": "Philipp Kewisch",
-+  "homepage_url": "https://addons.mozilla.org/thunderbird/addon/4631",
-+  "legacy": true,
-+  "applications": {
-+    "gecko": {
-+      "id": "{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}",
-+      "strict_min_version": "@THUNDERBIRD_VERSION@"
-+    }
-+  },
-+  "icons": {
-+    "32": "chrome://gdata-provider/content/gcal.png"
-+  }
-+}
-diff --git a/calendar/providers/gdata/moz.build b/calendar/providers/gdata/moz.build
---- a/calendar/providers/gdata/moz.build
-+++ b/calendar/providers/gdata/moz.build
-@@ -1,16 +1,17 @@
- # vim: set filetype=python:
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- XPI_NAME = 'gdata-provider'
-+export('XPI_NAME')
- 
--FINAL_TARGET_PP_FILES += ['install.rdf']
-+FINAL_TARGET_PP_FILES += ['manifest.json']
- 
- DIRS += [
-     'locales',
- ]
- 
- EXTRA_JS_MODULES += [
-     'modules/calUtilsShim.jsm',
-     'modules/gdataLogging.jsm',
-@@ -23,14 +24,17 @@ EXTRA_JS_MODULES += [
- 
- EXTRA_COMPONENTS += [
-     'components/calGoogleCalendar.js',
-     'components/calGoogleCalendar.manifest',
- ]
- 
- JAR_MANIFESTS += ['jar.mn']
- 
-+USE_EXTENSION_MANIFEST = True
-+export('USE_EXTENSION_MANIFEST')
-+
- JS_PREFERENCE_FILES += [
-     'defaults/preferences.js',
- ]
- 
- with Files('**'):
-     BUG_COMPONENT = ('Calendar', 'Provider: GData')
-diff --git a/calendar/test/unit/test_gdata_provider.js b/calendar/test/unit/test_gdata_provider.js
---- a/calendar/test/unit/test_gdata_provider.js
-+++ b/calendar/test/unit/test_gdata_provider.js
-@@ -4,22 +4,30 @@
- 
- (function() {
-     ChromeUtils.import("resource://gre/modules/Services.jsm");
-     Services.prefs.setBoolPref("javascript.options.showInConsole", true);
-     Services.prefs.setBoolPref("browser.dom.window.dump.enabled", true);
-     Services.prefs.setBoolPref("calendar.debug.log", true);
-     Services.prefs.setBoolPref("calendar.debug.log.verbose", true);
- 
--    let bindir = Services.dirsvc.get("CurProcD", Components.interfaces.nsIFile);
--    bindir.append("extensions");
--    bindir.append("{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}");
--    bindir.append("chrome.manifest");
--    dump("Loading" + bindir.path + "\n");
--    Components.manager.autoRegister(bindir);
-+    let xpiFile;
-+    let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-+    if (env.exists("MOZ_FETCHES_DIR")) {
-+        xpiFile = new FileUtils.File(env.get("MOZ_FETCHES_DIR"));
-+        xpiFile.append("gdata-provider.en-US.xpi");
-+    } else {
-+        xpiFile = Services.dirsvc.get("CurProcD", Components.interfaces.nsIFile);
-+        xpiFile.append("extensions");
-+        xpiFile.append("{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}");
-+    }
-+
-+    dump("Loading " + xpiFile.path + "\n");
-+    let manager = Cc["@mozilla.org/component-manager-extra;1"].getService(Ci.nsIComponentManagerExtra);
-+    manager.addLegacyExtensionManifestLocation(xpiFile);
- })();
- 
- ChromeUtils.import("resource://testing-common/httpd.js");
- ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
- ChromeUtils.import("resource://gre/modules/Preferences.jsm");
- ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
- 
- ChromeUtils.import("resource://gdata-provider/modules/gdataSession.jsm");
-@@ -502,48 +510,48 @@ function run_test() {
-                     run_next_test();
-                     do_test_finished();
-                 }
-             });
-         }
-     });
- }
- 
--add_task(function* test_migrate_cache() {
-+add_task(async function test_migrate_cache() {
-     let uriString = "googleapi://xpcshell/?calendar=xpcshell%40example.com";
-     let uri = Services.io.newURI(uriString);
-     let client = cal.getCalendarManager().createCalendar("gdata", uri);
-     let unwrapped = client.wrappedJSObject;
-     let migrateStorageCache = unwrapped.migrateStorageCache.bind(unwrapped);
- 
-     monkeyPatch(unwrapped, "resetSync", (protofunc) => {
-         return Promise.resolve();
-     });
- 
-     // No version, should not reset
--    equal(yield migrateStorageCache(), false);
-+    equal(await migrateStorageCache(), false);
-     equal(client.getProperty("cache.version"), 3);
- 
-     // Check migrate 1 -> 2
-     unwrapped.CACHE_DB_VERSION = 2;
-     client.setProperty("cache.version", 1);
--    equal(yield migrateStorageCache(), true);
-+    equal(await migrateStorageCache(), true);
-     equal(client.getProperty("cache.version"), 2);
- 
-     // Check migrate 2 -> 3 normal calendar
-     unwrapped.CACHE_DB_VERSION = 3;
-     client.setProperty("cache.version", 2);
--    equal(yield migrateStorageCache(), false);
-+    equal(await migrateStorageCache(), false);
- 
-     // Check migrate 2 -> 3 birthday calendar
-     unwrapped.CACHE_DB_VERSION = 3;
-     uri = "googleapi://xpcshell/?calendar=%23contacts%40group.v.calendar.google.com";
-     unwrapped.uri = Services.io.newURI(uri);
-     client.setProperty("cache.version", 2);
--    equal(yield migrateStorageCache(), true);
-+    equal(await migrateStorageCache(), true);
- });
- 
- add_test(function test_migrate_uri() {
-     function checkMigrate(fromUri, session, calendarId, tasksId) {
-         let uri = Services.io.newURI(fromUri);
-         let client = cal.getCalendarManager().createCalendar("gdata", uri);
- 
-         if (session) {
-@@ -567,17 +575,17 @@ add_test(function test_migrate_uri() {
-                  "example@example.com", "example@example.com", "@default");
- 
-     checkMigrate("ehmwtf://www.google.com/calendar/feeds/example%40example.com/public/full");
-     checkMigrate("googleapi://session/?calendar=calendarId&tasksId=tasksId");
- 
-     run_next_test();
- });
- 
--add_task(function* test_dateToJSON() {
-+add_task(async function test_dateToJSON() {
-     function _createDateTime(tzid, offset=0) {
-         let offsetFrom = offset <= 0 ? "-0" + (offset - 1) : "+0" + (offset - 1) + "00";
-         let offsetTo = "+0" + offset + "00";
-         let ics = ["BEGIN:VCALENDAR",
-             "BEGIN:VTIMEZONE",
-             "TZID:ThirdPartyZone",
-             "BEGIN:STANDARD",
-             "DTSTART:20071104T020000",
-@@ -666,17 +674,17 @@ add_task(function* test_dateToJSON() {
-     date = _createDateTime("Europe/London");
-     deepEqual(dateToJSON(date), { dateTime: "2015-01-30T12:00:00", timeZone: "Europe/London" });
- 
-     // date only
-     date.isDate = true;
-     deepEqual(dateToJSON(date), { date: "2015-01-30" });
- });
- 
--add_task(function* test_JSONToDate() {
-+add_task(async function test_JSONToDate() {
-     function convert(aEntry, aTimezone="Europe/Berlin") {
-         let tzs = cal.getTimezoneService();
-         let calendarTz = tzs.getTimezone(aTimezone);
-         let date = JSONToDate(aEntry, calendarTz);
-         return date ? date.icalString + " in " + date.timezone.tzid : null;
-     }
- 
-     // A date, using the passed in default timezone
-@@ -710,75 +718,75 @@ add_task(function* test_JSONToDate() {
-     // An offset matching the passed in calendar timezone. This should NOT be Africa/Algiers
-     equal(convert({ dateTime: "2015-01-02T03:04:05+01:00" }), "20150102T030405 in Europe/Berlin");
- 
-     // An offset that doesn't match the calendar timezone, will use the first timezone in that offset
-     info("The following warning is expected: 2015-01-02T03:04:05+04:00 does not match timezone offset for Europe/Berlin");
-     equal(convert({ dateTime: "2015-01-02T03:04:05+05:00" }), "20150102T030405 in Antarctica/Mawson");
- });
- 
--add_task(function* test_organizerCN() {
-+add_task(async function test_organizerCN() {
-     gServer.events = [];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     equal(client.getProperty("organizerCN"), null);
-     gServer.resetClient(client);
- 
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"2299601498276000\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event",
-         creator: gServer.creator,
-         organizer: gServer.creator,
-         start: { dateTime: "2006-06-10T18:00:00+02:00" },
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     }];
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     equal(client.getProperty("organizerCN"), gServer.creator.displayName);
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_always_readOnly() {
-+add_task(async function test_always_readOnly() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"2299601498276000\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event",
-         creator: gServer.creator,
-         organizer: gServer.creator,
-         start: { dateTime: "2006-06-10T18:00:00+02:00" },
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     }];
-     gServer.calendarListData.accessRole = "freeBusyReader";
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
-     ok(client.readOnly);
-     client.readOnly = false;
-     ok(client.readOnly);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
-     notEqual(items[0].title, "New Event");
-     gServer.resetClient(client);
- 
-     gServer.calendarListData.accessRole = "reader";
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     ok(client.readOnly);
-     client.readOnly = false;
-     ok(client.readOnly);
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_reset_sync() {
-+add_task(async function test_reset_sync() {
-     gServer.tasks = [{
-         kind: "tasks#task",
-         id: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
-         etag: "\"Lck7VNWFJuXdzMtOmrYPx0KFV2s/LTIwNjA4MDcyNDM\"",
-         title: "New Task",
-         updated: "2014-09-08T16:30:27.000Z",
-         selfLink: gServer.baseUri + "/tasks/v1/lists/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDow/tasks/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
-         position: "00000000000000130998",
-@@ -813,37 +821,37 @@ add_task(function* test_reset_sync() {
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event 2",
-         creator: gServer.creator,
-         organizer: gServer.creator,
-         start: { dateTime: "2006-06-10T18:00:00+02:00" },
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "fepf8uf6n7n04w7feukucs9n8e@google.com"
-     }];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let uncached = client.wrappedJSObject.mUncachedCalendar.wrappedJSObject;
-     let pclient = cal.async.promisifyCalendar(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 4);
- 
-     notEqual(client.getProperty("syncToken.events"), "");
-     notEqual(client.getProperty("lastUpdated.tasks"), "");
- 
--    yield uncached.resetSync();
--    items = yield pclient.getAllItems();
-+    await uncached.resetSync();
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     equal(client.getProperty("syncToken.events"), "");
-     equal(client.getProperty("lastUpdated.tasks"), "");
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_basicItems() {
-+add_task(async function test_basicItems() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"2299601498276000\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         status: "confirmed",
-         htmlLink: gServer.baseUri + "/calendar/event?eid=eventhash",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-@@ -897,20 +905,20 @@ add_task(function* test_basicItems() {
-         parent: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo4MDIzOTU2NDc",
-         links: [{
-             link: "mailto:something@example.com",
-             description: "link description",
-             type: "email"
-         }]
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 2);
- 
-     let event = cal.item.isEvent(items[0]) ? items[0] : items[1];
-     equal(event.id, "go6ijb0b46hlpbu4eeu92njevo@google.com");
-     equal(event.getProperty("STATUS"), "CONFIRMED");
-     equal(event.getProperty("URL"), gServer.baseUri + "/calendar/event?eid=eventhash");
-     equal(event.getProperty("CREATED").icalString, "20060608T210452Z");
-     equal(event.getProperty("LAST-MODIFIED").icalString, "20060608T210549Z");
-@@ -959,18 +967,18 @@ add_task(function* test_basicItems() {
-     equal(attachments.length, 1);
-     equal(attachments[0].uri.spec, "mailto:something@example.com");
-     equal(attachments[0].getParameter("X-GOOGLE-TYPE"), "email");
-     equal(attachments[0].getParameter("FILENAME"), "link description");
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_addModifyDeleteItem() {
--    let client = yield gServer.getClient();
-+add_task(async function test_addModifyDeleteItem() {
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-     equal(gServer.events.length, 0);
-     equal(gServer.tasks.length, 0);
- 
-     let event = cal.createEvent([
-         "BEGIN:VEVENT",
-         "CREATED:20060608T210452Z",
-         "LAST-MODIFIED:20060608T210549Z",
-@@ -1010,118 +1018,118 @@ add_task(function* test_addModifyDeleteI
-         "DUE;VALUE=DATE:20140904",
-         "COMPLETED:20140901T170000Z",
-         "RELATED-TO;RELTYPE=PARENT:MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo4MDIzOTU2NDc",
-         "ATTACH;FILENAME=\"link description\";X-GOOGLE-TYPE=email:mailto:something@example.com",
-         "END:VTODO"
-     ].join("\r\n"));
- 
-     // Add an event
--    let addedEvent = yield pclient.adoptItem(event);
-+    let addedEvent = await pclient.adoptItem(event);
-     notEqual(addedEvent.id, null);
-     equal(addedEvent.organizer.id, "mailto:xpcshell@example.com");
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(items[0].id, addedEvent.id);
-     equal(items[0].organizer.id, "mailto:xpcshell@example.com");
- 
-     equal(gServer.events.length, 1);
-     equal(gServer.tasks.length, 0);
- 
-     // Add a task
--    let addedTask = yield pclient.adoptItem(task);
-+    let addedTask = await pclient.adoptItem(task);
-     notEqual(addedTask.id, null);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 2);
-     equal(items[1].id, addedTask.id);
- 
-     equal(gServer.events.length, 1);
-     equal(gServer.tasks.length, 1);
- 
-     // Modify an event
-     let newEvent = items[0].clone();
-     newEvent.title = "changed";
- 
--    let modifiedEvent = yield pclient.modifyItem(newEvent, items[0]);
-+    let modifiedEvent = await pclient.modifyItem(newEvent, items[0]);
-     equal(modifiedEvent.title, "changed");
-     notEqual(modifiedEvent.getProperty("LAST-MODIFIED"), addedEvent.getProperty("LAST-MODIFIED"));
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 2);
-     equal(items[0].title, "changed");
-     equal(items[0].id, addedEvent.id);
-     equal(items[0].getProperty("LAST-MODIFIED"), modifiedEvent.getProperty("LAST-MODIFIED"));
-     equal(gServer.events.length, 1);
-     equal(gServer.tasks.length, 1);
- 
-     // Modify a task
-     let newTask = items[1].clone();
-     newTask.title = "changed";
- 
--    let modifiedTask = yield pclient.modifyItem(newTask, items[1]);
-+    let modifiedTask = await pclient.modifyItem(newTask, items[1]);
-     equal(modifiedTask.title, "changed");
-     notEqual(modifiedTask.getProperty("LAST-MODIFIED"), addedTask.getProperty("LAST-MODIFIED"));
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 2);
-     equal(items[1].title, "changed");
-     equal(items[1].id, addedTask.id);
-     equal(items[1].getProperty("LAST-MODIFIED"), modifiedTask.getProperty("LAST-MODIFIED"));
-     equal(gServer.events.length, 1);
-     equal(gServer.tasks.length, 1);
- 
-     // Delete an event
--    yield pclient.deleteItem(modifiedEvent);
--    items = yield pclient.getAllItems();
-+    await pclient.deleteItem(modifiedEvent);
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(gServer.events.length, 0);
-     equal(gServer.tasks.length, 1);
- 
-     // Delete a task
--    yield pclient.deleteItem(modifiedTask);
--    items = yield pclient.getAllItems();
-+    await pclient.deleteItem(modifiedTask);
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
-     equal(gServer.events.length, 0);
-     equal(gServer.tasks.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_recurring_event() {
--    let client = yield gServer.getClient();
-+add_task(async function test_recurring_event() {
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
-     let event = cal.createEvent([
-         "BEGIN:VEVENT",
-         "SUMMARY:Recurring Event",
-         "DTSTART:20060610T180000Z",
-         "DTEND:20060610T200000Z",
-         "RRULE:FREQ=WEEKLY",
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    event = yield pclient.addItem(event);
-+    event = await pclient.addItem(event);
-     equal(gServer.events.length, 1);
-     equal(gServer.events[0].recurrence.length, 1);
-     equal(gServer.events[0].recurrence[0], "RRULE:FREQ=WEEKLY");
- 
-     let occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
-     let changedOcc = occ.clone();
-     changedOcc.title = "changed";
-     event.recurrenceInfo.modifyException(occ, true);
- 
--    event = yield pclient.modifyItem(changedOcc, occ);
-+    event = await pclient.modifyItem(changedOcc, occ);
-     occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
-     equal(occ.title, "changed");
-     equal(gServer.events.length, 2);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_recurring_exception() {
-+add_task(async function test_recurring_exception() {
-     gServer.syncs = [{
-         token: "1",
-         events: [{
-             kind: "calendar#event",
-             etag: "\"1\"",
-             id: "go6ijb0b46hlpbu4eeu92njevo",
-             created: "2006-06-08T21:04:52.000Z",
-             updated: "2006-06-08T21:05:49.138Z",
-@@ -1156,41 +1164,41 @@ add_task(function* test_recurring_except
-             start: { dateTime: "2006-06-17T18:00:00+02:00" },
-             end: { dateTime: "2006-06-17T20:00:00+02:00" },
-             status: "cancelled",
-             recurringEventId: "go6ijb0b46hlpbu4eeu92njevo",
-             originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
-         }]
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     let exIds = items[0].recurrenceInfo.getExceptionIds({});
-     equal(exIds.length, 1);
- 
-     let ex = items[0].recurrenceInfo.getExceptionFor(exIds[0]);
-     equal(ex.title, "New Event changed");
- 
-     client.refresh();
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     exIds = items[0].recurrenceInfo.getExceptionIds({});
-     equal(exIds.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_recurring_cancelled_exception() {
-+add_task(async function test_recurring_cancelled_exception() {
-     gServer.syncs = [{
-         token: "1",
-         events: [{
-             kind: "calendar#event",
-             etag: "\"1\"",
-             id: "go6ijb0b46hlpbu4eeu92njevo",
-             status: "cancelled",
-         }, {
-@@ -1198,28 +1206,28 @@ add_task(function* test_recurring_cancel
-             etag: "\"2\"",
-             id: "go6ijb0b46hlpbu4eeu92njevo_20060617T160000Z",
-             status: "cancelled",
-             recurringEventId: "go6ijb0b46hlpbu4eeu92njevo",
-             originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
-         }]
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_import_invitation() {
-+add_task(async function test_import_invitation() {
-     Preferences.set("calendar.google.enableAttendees", true);
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-     let event = cal.createEvent([
-         "BEGIN:VEVENT",
-         "UID:xpcshell-import",
-         "CREATED:20060608T210452Z",
-         "LAST-MODIFIED:20060608T210549Z",
-         "DTSTAMP:20060608T210549Z",
-         "SUMMARY:New Event",
-@@ -1230,24 +1238,24 @@ add_task(function* test_import_invitatio
-         "ATTENDEE;CN=Eggs P. Seashell;PARTSTAT=TENTATIVE;CUTYPE=INDIVIDUAL;",
-         " ROLE=REQ-PARTICIPANT:mailto:xpcshell@example.com",
-         "DTSTART:20060610T180000Z",
-         "DTEND:20060610T200000Z",
-         "SEQUENCE:1",
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    let addedItem = yield pclient.adoptItem(event);
-+    let addedItem = await pclient.adoptItem(event);
-     equal(gServer.events.length, 1);
-     equal(addedItem.icalString, event.icalString);
-     gServer.resetClient(client);
-     Preferences.set("calendar.google.enableAttendees", false);
- });
- 
--add_task(function* test_modify_invitation() {
-+add_task(async function test_modify_invitation() {
-     Preferences.set("calendar.google.enableAttendees", true);
-     let organizer = {
-         displayName: "organizer name",
-         email: "organizer@example.com",
-         organizer: true,
-         responseStatus: "tentative"
-     };
-     let attendee = Object.assign({}, gServer.creator);
-@@ -1272,36 +1280,36 @@ add_task(function* test_modify_invitatio
-         transparency: "transparent",
-         visibility: "private",
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com",
-         sequence: 1,
-         attendees: [organizer, attendee],
-     }];
- 
-     // Case #1: User is attendee
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     let item = items[0];
-     let att = cal.itip.getInvitedAttendee(item);
-     let newItem = item.clone();
- 
-     notEqual(att, null);
-     equal(att.id, "mailto:" + attendee.email);
-     equal(att.participationStatus, "NEEDS-ACTION");
- 
-     newItem.removeAttendee(att);
-     att = att.clone();
-     att.participationStatus = "ACCEPTED";
-     newItem.addAttendee(att);
- 
--    yield pclient.modifyItem(newItem, items[0]);
-+    await pclient.modifyItem(newItem, items[0]);
-     equal(gServer.lastMethod, "PATCH");
- 
-     // Case #2: User is organizer
-     let events = gServer.events;
-     gServer.resetClient(client);
-     gServer.events = events;
- 
-     organizer = Object.assign({}, gServer.creator);
-@@ -1312,42 +1320,42 @@ add_task(function* test_modify_invitatio
-         email: "attendee@example.com",
-         responseStatus: "tentative"
-     };
- 
-     gServer.events[0].organizer = gServer.creator;
-     gServer.events[0].creator = gServer.creator;
-     gServer.events[0].attendees = [organizer, attendee];
- 
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     item = items[0];
-     let org = item.getAttendeeById("mailto:" + organizer.email);
-     newItem = item.clone();
- 
-     notEqual(org, null);
-     equal(org.id, "mailto:" + organizer.email);
-     equal(org.participationStatus, "ACCEPTED");
- 
-     newItem.removeAttendee(org);
-     org = org.clone();
-     org.participationStatus = "TENTATIVE";
-     newItem.addAttendee(org);
- 
--    modifiedItem = yield pclient.modifyItem(newItem, items[0]);
-+    modifiedItem = await pclient.modifyItem(newItem, items[0]);
-     equal(gServer.lastMethod, "PUT");
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_metadata() {
-+add_task(async function test_metadata() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event",
-         creator: gServer.creator,
-@@ -1361,91 +1369,91 @@ add_task(function* test_metadata() {
-         id: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
-         etag: "\"2\"",
-         title: "New Task",
-         updated: "2014-09-08T16:30:27.000Z",
-         selfLink: gServer.baseUri + "/tasks/v1/lists/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDow/tasks/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
-         notes: "description"
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let offline = client.wrappedJSObject.mCachedCalendar;
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
-     // Check initial metadata
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     let meta = getAllMeta(offline);
-     let [event, task] = items;
-     ok(cal.item.isEvent(event));
-     ok(cal.item.isToDo(task));
-     equal(meta.size, 2);
-     equal(meta.get(event.hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
-     equal(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
- 
-     // Modify an event
-     gServer.nextEtag = '"3"';
-     let newEvent = event.clone();
-     newEvent.title = "changed";
--    yield pclient.modifyItem(newEvent, event);
-+    await pclient.modifyItem(newEvent, event);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     meta = getAllMeta(offline);
-     [event, task] = items;
-     ok(cal.item.isEvent(event));
-     ok(cal.item.isToDo(task));
-     equal(meta.size, 2);
-     equal(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
-     equal(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
- 
-     // Modify a task
-     gServer.nextEtag = '"4"';
-     let newTask = task.clone();
-     newTask.title = "changed";
--    yield pclient.modifyItem(newTask, task);
-+    await pclient.modifyItem(newTask, task);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     meta = getAllMeta(offline);
-     [event, task] = items;
-     equal(meta.size, 2);
-     equal(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
-     equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
- 
-     // Delete an event
--    yield pclient.deleteItem(event);
-+    await pclient.deleteItem(event);
-     meta = getAllMeta(offline);
-     equal(meta.size, 1);
-     equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
- 
-     // Delete a task
--    yield pclient.deleteItem(task);
-+    await pclient.deleteItem(task);
-     meta = getAllMeta(offline);
-     equal(meta.size, 0);
- 
-     // Add an event
-     gServer.nextEtag = '"6"';
--    newEvent = yield pclient.addItem(event);
-+    newEvent = await pclient.addItem(event);
-     meta = getAllMeta(offline);
-     equal(meta.size, 1);
-     equal(gServer.events.length, 1);
-     equal(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
- 
-     // Add a task
-     gServer.nextEtag = '"7"';
--    newTask = yield pclient.addItem(task);
-+    newTask = await pclient.addItem(task);
-     meta = getAllMeta(offline);
-     equal(meta.size, 2);
-     equal(gServer.events.length, 1);
-     equal(gServer.tasks.length, 1);
-     equal(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
-     equal(meta.get(newTask.hashId), ['"7"', gServer.tasks[0].id, false].join("\u001A"));
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_metadata_recurring() {
-+add_task(async function test_metadata_recurring() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event",
-         creator: gServer.creator,
-@@ -1471,145 +1479,145 @@ add_task(function* test_metadata_recurri
-         id: "go6ijb0b46hlpbu4eeu92njevo_20060617T160000Z",
-         summary: "New Event next week",
-         start: { dateTime: "2006-06-17T18:00:00+02:00" },
-         end: { dateTime: "2006-06-17T20:00:00+02:00" },
-         recurringEventId: "go6ijb0b46hlpbu4eeu92njevo",
-         originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let offline = client.wrappedJSObject.mCachedCalendar;
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
- 
-     let meta = getAllMeta(offline);
-     equal(meta.size, 3);
-     equal(meta.get(items[0].hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
- 
-     // The exception metadata should also exist
-     let exIds = items[0].recurrenceInfo.getExceptionIds({});
-     equal(exIds.length, 2);
-     let ex = items[0].recurrenceInfo.getExceptionFor(exIds[0]);
-     equal(meta.get(ex.hashId), ['"2"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
- 
-     // Changing an exception should retain the metadata entries
-     let newEx = ex.clone();
-     newEx.title = "New Event changed again";
-     gServer.nextEtag = '"4"';
--    yield pclient.modifyItem(newEx, ex);
-+    await pclient.modifyItem(newEx, ex);
-     meta = getAllMeta(offline);
-     equal(meta.size, 3);
-     equal(meta.get(newEx.hashId), ['"4"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
- 
-     // Deleting an exception should delete the metadata, as it turns into an EXDATE
-     let newItem = items[0].clone();
-     newItem.recurrenceInfo.removeOccurrenceAt(exIds[0]);
--    yield pclient.modifyItem(newItem, items[0]);
-+    await pclient.modifyItem(newItem, items[0]);
- 
-     meta = getAllMeta(offline);
-     equal(meta.size, 2);
- 
-     // Deleting the master item should remove all metadata entries
--    yield pclient.deleteItem(items[0]);
-+    await pclient.deleteItem(items[0]);
-     meta = getAllMeta(offline);
-     equal(meta.size, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_conflict_modify() {
-+add_task(async function test_conflict_modify() {
-     // TODO task/event conflicts are handled in the same way so I'm going to
-     // skip adding tests for tasks here, but it probably wouldn't hurt to
-     // create them at some point.
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event",
-         creator: gServer.creator,
-         organizer: gServer.creator,
-         start: { dateTime: "2006-06-10T18:00:00+02:00" },
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     }];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
--    let item = (yield pclient.getAllItems())[0];
-+    let item = (await pclient.getAllItems())[0];
- 
-     // Case #1: Modified on server, modify locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-     let newItem = item.clone();
-     newItem.title = "local change";
-     gServer.events[0].etag = '"2"';
-     gServer.events[0].summary = "remote change";
--    let modifiedItem = yield pclient.modifyItem(newItem, item);
--    item = (yield pclient.getAllItems())[0];
-+    let modifiedItem = await pclient.modifyItem(newItem, item);
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "local change");
-     notEqual(gServer.events[0].etag, '"2"');
-     equal(item.title, "local change");
-     equal(modifiedItem.title, "local change");
-     equal(gServer.events.length, 1);
- 
-     // Case #2: Modified on server, modify locally, don't overwrite conflict
-     MockConflictPrompt.overwrite = false;
-     gServer.events[0].etag = '"3"';
-     gServer.events[0].summary = "remote change";
-     try {
--        modifiedItem = yield pclient.modifyItem(newItem, item);
-+        modifiedItem = await pclient.modifyItem(newItem, item);
-         do_throw("Expected modifyItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
-             throw e;
-         }
-     }
- 
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    item = (yield pclient.getAllItems())[0];
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "remote change");
-     equal(gServer.events[0].etag, '"3"');
-     equal(item.title, "remote change");
- 
-     // Case #3: Modified on server, delete locally, don't overwrite conflict
-     MockConflictPrompt.overwrite = false;
-     gServer.events[0].etag = '"4"';
-     gServer.events[0].summary = "remote change";
-     try {
--        yield pclient.deleteItem(item);
-+        await pclient.deleteItem(item);
-         do_throw("Expected deleteItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
-             throw e;
-         }
-     }
- 
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    item = (yield pclient.getAllItems())[0];
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "remote change");
-     equal(gServer.events[0].etag, '"4"');
-     equal(item.title, "remote change");
- 
-     // Case #4: Modified on server, delete locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-     gServer.events[0].etag = '"5"';
-     gServer.events[0].summary = "remote change";
--    yield pclient.deleteItem(item);
--    item = (yield pclient.getAllItems())[0];
-+    await pclient.deleteItem(item);
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_conflict_delete() {
-+add_task(async function test_conflict_delete() {
-     // TODO task/event conflicts are handled in the same way so I'm going to
-     // skip adding tests for tasks here, but it probably wouldn't hurt to
-     // create them at some point.
-     let coreEvent = {
-         kind: "calendar#event",
-         etag: "\"2\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-@@ -1619,100 +1627,100 @@ add_task(function* test_conflict_delete(
-         organizer: gServer.creator,
-         start: { dateTime: "2006-06-10T18:00:00+02:00" },
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     };
- 
-     // Load intial event to server
-     gServer.events = [coreEvent];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
--    let item = (yield pclient.getAllItems())[0];
-+    let item = (await pclient.getAllItems())[0];
- 
-     // Case #1: Deleted on server, modify locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-     gServer.events = [];
-     let newItem = item.clone();
-     newItem.title = "local change";
--    let modifiedItem = yield pclient.modifyItem(newItem, item);
--    item = (yield pclient.getAllItems())[0];
-+    let modifiedItem = await pclient.modifyItem(newItem, item);
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "local change");
-     notEqual(gServer.events[0].etag, '"2"');
-     equal(item.title, "local change");
-     equal(modifiedItem.title, "local change");
-     equal(gServer.events.length, 1);
- 
-     // Case #2: Deleted on server, modify locally, don't overwrite conflict
-     MockConflictPrompt.overwrite = false;
-     gServer.events = [];
-     try {
--        modifiedItem = yield pclient.modifyItem(newItem, item);
-+        modifiedItem = await pclient.modifyItem(newItem, item);
-         do_throw("Expected modifyItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
-             throw e;
-         }
-     }
-     // The next synchronize should cause the event to be deleted locally.
-     coreEvent.status = "cancelled";
-     gServer.events = [coreEvent];
- 
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 0);
-     equal(gServer.events.length, 1);
- 
-     // Put the event back in the calendar for the next run
-     delete gServer.events[0].status;
-     client.refresh();
--    yield gServer.waitForLoad(client);
--    items = yield pclient.getAllItems();
-+    await gServer.waitForLoad(client);
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     // Case #3: Deleted on server, delete locally, don't overwrite conflict
-     MockConflictPrompt.overwrite = false;
-     gServer.events = [];
-     try {
--        yield pclient.deleteItem(item);
-+        await pclient.deleteItem(item);
-         do_throw("Expected deleteItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
-             throw e;
-         }
-     }
-     // The next synchronize should cause the event to be deleted locally.
-     coreEvent.status = "cancelled";
-     gServer.events = [coreEvent];
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     // Put the event back in the calendar for the next run
-     delete gServer.events[0].status;
-     client.refresh();
--    yield gServer.waitForLoad(client);
--    items = yield pclient.getAllItems();
-+    await gServer.waitForLoad(client);
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     // Case #4: Deleted on server, delete locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-     gServer.events = [];
--    yield pclient.deleteItem(item);
--    items = yield pclient.getAllItems();
-+    await pclient.deleteItem(item);
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_default_alarms() {
-+add_task(async function test_default_alarms() {
-     let defaultReminders = [
-         { method: "popup", minutes: 10 },
-         { method: "email", minutes: 20 },
-     ];
-     gServer.calendarListData.defaultReminders = defaultReminders;
-     gServer.eventsData.defaultReminders = defaultReminders;
-     gServer.events = [{
-         kind: "calendar#event",
-@@ -1725,21 +1733,21 @@ add_task(function* test_default_alarms()
-         organizer: gServer.creator,
-         start: { dateTime: "2006-06-10T18:00:00+02:00" },
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com",
-         reminders: { useDefault: true }
-     }];
- 
-     // Case #1: read default alarms from event stream
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-     equal(client.getProperty("settings.defaultReminders"), JSON.stringify(defaultReminders));
- 
--    let item = (yield pclient.getAllItems())[0];
-+    let item = (await pclient.getAllItems())[0];
-     let alarms = item.getAlarms({});
- 
-     equal(alarms.length, 2);
-     ok(alarms.every(x => x.getProperty("X-DEFAULT-ALARM") == "TRUE"));
-     equal(alarms[0].action, "DISPLAY");
-     equal(alarms[0].offset.icalString, "-PT10M");
-     equal(alarms[1].action, "EMAIL");
-     equal(alarms[1].offset.icalString, "-PT20M");
-@@ -1754,17 +1762,17 @@ add_task(function* test_default_alarms()
-         "X-DEFAULT-ALARM:TRUE",
-         "ACTION:DISPLAY",
-         "TRIGGER;VALUE=DURATION:PT0S",
-         "DESCRIPTION:Description",
-         "END:VALARM",
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    yield pclient.addItem(event);
-+    await pclient.addItem(event);
-     ok(gServer.events[1].reminders.useDefault);
-     equal(gServer.events[1].reminders.overrides.length, 0);
- 
-     // Case #3: Mixed default/non-default alarms. Not sure this will happen
-     event = cal.createEvent([
-         "BEGIN:VEVENT",
-         "SUMMARY:Default Alarms",
-         "DTSTART:20060610T180000Z",
-@@ -1778,57 +1786,57 @@ add_task(function* test_default_alarms()
-         "BEGIN:VALARM",
-         "ACTION:DISPLAY",
-         "TRIGGER;VALUE=DURATION:-PT5M",
-         "DESCRIPTION:Description",
-         "END:VALARM",
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    yield pclient.addItem(event);
-+    await pclient.addItem(event);
-     ok(gServer.events[2].reminders.useDefault);
-     equal(gServer.events[2].reminders.overrides.length, 1);
-     equal(gServer.events[2].reminders.overrides[0].minutes, 5);
- 
-     gServer.resetClient(client);
- 
-     // Case #4a: Empty default alarms
-     gServer.calendarListData.defaultReminders = [];
-     gServer.eventsData.defaultReminders = [];
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
-     event = cal.createEvent([
-         "BEGIN:VEVENT",
-         "SUMMARY:Default Alarms Empty",
-         "DTSTART:20060610T180000Z",
-         "DTEND:20060610T200000Z",
-         "X-DEFAULT-ALARM:TRUE",
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    yield pclient.addItem(event);
-+    await pclient.addItem(event);
-     ok(gServer.events[0].reminders.useDefault);
-     equal(gServer.events[0].reminders.overrides, undefined);
- 
-     let events = gServer.events;
-     gServer.resetClient(client);
- 
-     // Case #4b: Read an item with empty default alarms
-     gServer.events = events;
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    item = (yield pclient.getAllItems())[0];
-+    item = (await pclient.getAllItems())[0];
-     equal(item.getProperty("X-DEFAULT-ALARM"), "TRUE");
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_paginate() {
-+add_task(async function test_paginate() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-         id: "go6ijb0b46hlpbu4eeu92njevo",
-         created: "2006-06-08T21:04:52.000Z",
-         updated: "2006-06-08T21:05:49.138Z",
-         summary: "New Event",
-         creator: gServer.creator,
-@@ -1867,35 +1875,35 @@ add_task(function* test_paginate() {
-         updated: "2014-09-08T16:30:27.000Z",
-         selfLink: gServer.baseUri + "/tasks/v1/lists/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDow/tasks/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo5OTU0Mjk2MzQ",
-         position: "00000000000000130993",
-         status: "needsAction"
-     }];
- 
-     Preferences.set("calendar.google.maxResultsPerRequest", 1);
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
- 
-     // Make sure all pages were requested
-     equal(gServer.eventsData.nextPageToken, null);
-     equal(gServer.tasksData.nextPageToken, null);
- 
-     // ...and we have all items. Not checking props
-     // because the other tests do this sufficiently.
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 4);
- 
-     equal(client.getProperty("syncToken.events"), "next-sync-token");
- 
-     Preferences.reset("calendar.google.maxResultsPerRequest");
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_incremental_reset() {
-+add_task(async function test_incremental_reset() {
-     gServer.syncs = [{
-         token: "1",
-         events: [{
-             kind: "calendar#event",
-             etag: "\"1\"",
-             id: "go6ijb0b46hlpbu4eeu92njevo",
-             created: "2006-06-08T21:04:52.000Z",
-             updated: "2006-06-08T21:05:49.138Z",
-@@ -1920,27 +1928,27 @@ add_task(function* test_incremental_rese
-             summary: "New Event 2",
-             creator: gServer.creator,
-             organizer: gServer.creator,
-             start: { dateTime: "2006-06-10T18:00:00+02:00" },
-             end: { dateTime: "2006-06-10T20:00:00+02:00" },
-             iCalUID: "fepf8uf6n7n04w7feukucs9n8e@google.com"
-         }]
-     }];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(items[0].title, "New Event");
- 
-     client.refresh();
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(items[0].title, "New Event 2");
- 
-     equal(gServer.syncs.length, 0);
-     equal(client.getProperty("syncToken.events"), "last");
- 
-     gServer.resetClient(client);
- });
-diff --git a/calendar/test/unit/xpcshell-shared.ini b/calendar/test/unit/xpcshell-shared.ini
---- a/calendar/test/unit/xpcshell-shared.ini
-+++ b/calendar/test/unit/xpcshell-shared.ini
-@@ -24,18 +24,18 @@
- [test_datetime_before_1970.js]
- [test_datetimeformatter.js]
- [test_deleted_items.js]
- [test_duration.js]
- [test_extract.js]
- [test_email_utils.js]
- [test_freebusy.js]
- [test_freebusy_service.js]
--#[test_gdata_provider.js]
--#requesttimeoutfactor = 2
-+[test_gdata_provider.js]
-+requesttimeoutfactor = 2
- [test_hashedarray.js]
- [test_ics.js]
- [test_ics_parser.js]
- [test_ics_service.js]
- [test_imip.js]
- [test_items.js]
- [test_ltninvitationutils.js]
- [test_providers.js]
-diff --git a/mail/app.mozbuild b/mail/app.mozbuild
---- a/mail/app.mozbuild
-+++ b/mail/app.mozbuild
-@@ -16,16 +16,17 @@ if CONFIG['MOZ_EXTENSIONS']:
-     DIRS += ['/%s/extensions' % CONFIG['mozreltopsrcdir']]
- 
- DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
- 
- 
- if CONFIG['MOZ_CALENDAR']:
-     DIRS += [
-         '/%s/calendar/lightning' % CONFIG['commreltopsrcdir'],
--        '/%s/calendar/timezones' % CONFIG['commreltopsrcdir']
-+        '/%s/calendar/providers/gdata' % CONFIG['commreltopsrcdir'],
-+        '/%s/calendar/timezones' % CONFIG['commreltopsrcdir'],
-     ]
- 
- DIRS += [
-     '/%s/chat' % CONFIG['commreltopsrcdir'],
-     '/%s/editor/ui' % CONFIG['commreltopsrcdir'],
-     '/%s/mail' % CONFIG['commreltopsrcdir'],
- ]
-diff --git a/mail/testsuite-targets.mk b/mail/testsuite-targets.mk
---- a/mail/testsuite-targets.mk
-+++ b/mail/testsuite-targets.mk
-@@ -56,10 +56,11 @@ else
- package-tests: stage-mozmill
- endif
- 
- stage-mozmill: make-stage-dir
- 	$(MAKE) -C $(commtopobjdir)/mail/test/mozmill stage-package
- 
- stage-calendar: make-stage-dir
- 	$(MAKE) -C $(commtopobjdir)/calendar/lightning stage-package
-+	$(MAKE) -C $(commtopobjdir)/calendar/providers/gdata stage-package
- 
- .PHONY: stage-mozmill stage-calendar
-diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
---- a/taskcluster/ci/test/tests.yml
-+++ b/taskcluster/ci/test/tests.yml
-@@ -66,16 +66,19 @@ xpcshell:
-                     - remove_executables.py
-                     - unittests/thunderbird_extra.py
-         extra-options:
-             - "--xpcshell-suite=xpcshell"
-         requires-signed-builds:
-             by-test-platform:
-                 windows.*: true
-                 default: false
-+    fetches:
-+        build:
-+            - gdata-provider.en-US.xpi
- 
- mozmill:
-     description: "mozmill test run"
-     suite: mozmill
-     treeherder-symbol: Z(Z)
-     run-on-projects: built-projects
-     docker-image:
-         in-tree: "desktop1604-test"
-

diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
new file mode 100644
index 0000000..9770a1a
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
@@ -0,0 +1,10 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.display.use_system_colors",   true);
+pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("mail.shell.checkDefaultClient", false);
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1");
+pref("extensions.autoDisableScopes", 0);

diff --git a/mail-client/thunderbird/thunderbird-60.0.ebuild b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild
similarity index 97%
rename from mail-client/thunderbird/thunderbird-60.0.ebuild
rename to mail-client/thunderbird/thunderbird-60.0-r1.ebuild
index 28892cf..6b28658 100644
--- a/mail-client/thunderbird/thunderbird-60.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild
@@ -17,6 +17,7 @@ uk vi zh-CN zh-TW )
 MOZ_PV="${PV/_beta/b}"
 
 # Patches
+PATCHTB="thunderbird-60.0-patches-0"
 PATCHFF="firefox-60.0-patches-02"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
@@ -35,13 +36,13 @@ inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils mozconfig-v6.60 pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened lightning +minimal mozdom rust selinux"
 RESTRICT="!bindist? ( bindist )"
 
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
 SRC_URI="${SRC_URI}
 	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
 	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
@@ -136,8 +137,7 @@ src_prepare() {
 
 	# Apply our Thunderbird patchset
 	pushd "${S}"/comm &>/dev/null || doe
-	eapply "${FILESDIR}"/1000_fix_gentoo_preferences.patch
-	eapply "${FILESDIR}"/tb60-build-gdata-provider.patch
+	eapply "${WORKDIR}"/thunderbird
 
 	# simulate old directory structure just in case it helps eapply_user
 	ln -s .. mozilla || die
@@ -243,7 +243,7 @@ src_install() {
 	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
 
 	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
 		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
 		|| die
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2018-08-14  0:25 Ian Stakenvicius
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Stakenvicius @ 2018-08-14  0:25 UTC (permalink / raw
  To: gentoo-commits

commit:     68dc8890fcf714b9a45d233476987a7a00692747
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 14 00:13:12 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 00:13:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=68dc8890

thunderbird: fix localization, lightning installation

Note - this is an in-place update for mozilla overlay

 mail-client/thunderbird/Manifest                   |    3 +-
 .../files/tb60-build-gdata-provider.patch          | 1473 ++++++++++++++++++++
 mail-client/thunderbird/thunderbird-60.0.ebuild    |   18 +-
 3 files changed, 1484 insertions(+), 10 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 868a82e..96e86b3 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,8 +1,9 @@
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
 DIST firefox-60.0-patches-02.tar.xz 111088 BLAKE2B 9564d55b243c5e759a83b6d48076d3de9060c7bd99498df3ced477077b5ce2e2582452979872f0707ee681633d04a9761e2887282d69cced7e20bf39efc38c2c SHA512 919ffdb0624f1fa68a7e457f5270833e69c8f29e1764a46edfc345056c4e8ada1e85e53de3766fd9a0b2afc1a959c15762e27f43e29f5945176f9ade362407ac
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
-DIST lightning-5.4.8.tar.xz 1891528 BLAKE2B 8b15d2058171d09b8fc1e992b48d36f024ae9405803c0626060bbdb75318a6ce652cc1b527cc2a30041c81f2ea215c63950912a8783d55e4042c2fcc270bfccf SHA512 9c36ad58ef77f9e7a1e34c07db0357d4db75a44c837068016e1413e31cc762f2cc1b4cf1edf8a78124077053db6ddddec68c17ba42da91c2a05dc87616f742dc
+DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
+DIST lightning-6.2.tar.xz 1647116 BLAKE2B 88a44c7ee6a1395372e260e8d0a0e00a6b2546398000ca701b74f98f85b73424e4126215c94543534ae1159de6644e81583353d53ae15b0e82592b17bf5fb2da SHA512 d51e56c6b21829dafa59cef086afb23f4afdd7dda5b1fdc1f6ad47ba0945e11dbedc826bb9764f42323275e251a48802eb5af2f0e5da27f3a64c105ee9f0dc4a
 DIST thunderbird-52.9.0-ar.xpi 604235 BLAKE2B 976fa2de5d2d132dd1aa835292c3991a1faaddd542a0eb9f72a75ae200c68edaccc921d5263a6c69324af8b189ada47f016863d1df147b3e54951fb7d3f1ad12 SHA512 50b9e878463ffdaae09fbe1e5567200892f20c3c593e9c53ac7524f58c688711e58b2cd8a668a5ae82e3cf96f0c178f5ff111d2f56f049bf3c771b881715a67c
 DIST thunderbird-52.9.0-ast.xpi 541173 BLAKE2B 3aa4e92287ba968f22d10c9fab41fc790042705544ddb998a43d91ac0912f9b028de63fe18cd982c40183aaddc628a4c547428db96c99df7e11e20223f573469 SHA512 70d8168751acf69915f3c6643feb23fce813a313243a392bd3979db24c4f8641b56f92a9f5861aa4224549ff621fadaf4b0f1ad924cf68b9daf6687d15d886c8
 DIST thunderbird-52.9.0-be.xpi 570932 BLAKE2B b2cbd5730b479e2839d463ba2d9b28b2807fe63d28225080e0900a4b284b752ad770475fa632b6dbffac2be151813c4bc4fa7142c1271a586637458fcd3c52c0 SHA512 a5d607682e7519634c6d8efb6e688c476f144287973aeb854f3dc708f07a05c57784a0d2e6416bae287b3315e5addb04384077f55398989d3b8fde24a1a8f826

diff --git a/mail-client/thunderbird/files/tb60-build-gdata-provider.patch b/mail-client/thunderbird/files/tb60-build-gdata-provider.patch
new file mode 100644
index 0000000..6323865
--- /dev/null
+++ b/mail-client/thunderbird/files/tb60-build-gdata-provider.patch
@@ -0,0 +1,1473 @@
+
+# HG changeset patch
+# User Geoff Lankow <geoff@darktrojan.net>
+# Date 1533166138 -43200
+# Node ID b3975c8d27c10bfad83b9af956fea2bb43045b1a
+# Parent  00325311f1a5d6e8d27a4364c1792232f52995bf
+Bug 1471326 - Build GData Provider with Thunderbird and re-enable its test test_gdata_provider.js. r=philipp
+
+diff --git a/calendar/lightning/versions.mk b/calendar/lightning/versions.mk
+--- a/calendar/lightning/versions.mk
++++ b/calendar/lightning/versions.mk
+@@ -7,18 +7,16 @@ THUNDERBIRD_VERSION := $(shell cat $(com
+ SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
+ 
+ ifdef MOZ_SUITE
+ LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(THUNDERBIRD_VERSION))
+ else
+ LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
+ endif
+ 
+-#GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
+-
+ # For extensions we require a max version that is compatible across security releases.
+ # THUNDERBIRD_MAXVERSION and SEAMONKEY_MAXVERSION is our method for doing that.
+ # Alpha versions 10.0a1 and 10.0a2 aren't affected
+ # For Seamonkey, 2.17 becomes 2.17.*, 2.17.1 becomes 2.17.*
+ # For Thunderbird, 10.0 becomes 10.*, 10.0.1 becomes 10.*
+ THUNDERBIRD_MAXVERSION := $(THUNDERBIRD_VERSION)
+ ifneq (a,$(findstring a,$(THUNDERBIRD_VERSION)))
+ THUNDERBIRD_MAXVERSION := $(shell echo $(THUNDERBIRD_VERSION) | sed 's|\(^[0-9]*\)\.\([0-9]*\).*|\1|' ).*
+diff --git a/calendar/providers/gdata/Makefile.in b/calendar/providers/gdata/Makefile.in
+--- a/calendar/providers/gdata/Makefile.in
++++ b/calendar/providers/gdata/Makefile.in
+@@ -1,33 +1,28 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
+-XPI_VERSION = $(GDATA_VERSION)
++XPI_NAME = gdata-provider
++XPI_PKGNAME = gdata-provider.$(AB_CD)
+ XPI_EM_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
+ XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
+ 
+-DEFINES += -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
+-           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
++ifdef MOZ_SUITE
++LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(THUNDERBIRD_VERSION))
++else
++LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
++endif
++
++GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
++THUNDERBIRD_VERSION := $(shell cat $(commtopsrcdir)/mail/config/version.txt)
++SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
++
++DEFINES += -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
+            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
+-           -DCOMM_BUILD=$(COMM_BUILD) \
+            -DGDATA_VERSION=$(GDATA_VERSION) \
+            $(NULL)
+ 
+-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+-# If the macbundle dist dir was already created, sync the gdata provider here to avoid
+-# the need to make -C objdir/mail/app each time
+-tools repackage::
+-	[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -a $(FINAL_TARGET)/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/extensions/$(XPI_EM_ID) || true
+-endif
+-
+-# stage the extension for use in packaged tests
+-PKG_STAGE = $(DIST)/test-stage
++include $(commtopsrcdir)/calendar/lightning/lightning-packager.mk
+ 
+ stage-package:
+-	$(NSINSTALL) -D $(PKG_STAGE)/extensions/$(XPI_EM_ID)
+-	(cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/extensions/$(XPI_EM_ID) && tar -xf -)
+-
+-include $(moztopsrcdir)/config/rules.mk
+-include $(commtopsrcdir)/calendar/lightning/versions.mk
+-include $(commtopsrcdir)/calendar/lightning/lightning-packager.mk
++	$(PYTHON) -u $(MOZILLA_DIR)/build/upload.py $(DIST)/xpi-stage/$(XPI_PKGNAME).xpi
+diff --git a/calendar/providers/gdata/install.rdf b/calendar/providers/gdata/manifest.json
+rename from calendar/providers/gdata/install.rdf
+rename to calendar/providers/gdata/manifest.json
+--- a/calendar/providers/gdata/install.rdf
++++ b/calendar/providers/gdata/manifest.json
+@@ -1,41 +1,23 @@
+-<?xml version="1.0" encoding="UTF-8"?>
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++#
+ #filter substitution
+-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+-   - License, v. 2.0. If a copy of the MPL was not distributed with this
+-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+-
+-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+-
+-  <Description about="urn:mozilla:install-manifest">
+-    <em:id>{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}</em:id>
+-    <em:version>@GDATA_VERSION@</em:version>
+-    <em:type>2</em:type>
+-
+-    <!-- Target Application this extension can install into,
+-         with minimum and maximum supported versions. -->
+-    <em:targetApplication>
+-      <Description>
+-        <!-- Thunderbird -->
+-        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+-        <em:minVersion>52.0</em:minVersion>
+-        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
+-      </Description>
+-    </em:targetApplication>
+-    <em:targetApplication>
+-      <Description>
+-        <!-- SeaMonkey -->
+-        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+-        <em:minVersion>2.49</em:minVersion>
+-        <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
+-      </Description>
+-    </em:targetApplication>
+-
+-    <em:name>Provider for Google Calendar</em:name>
+-    <em:description>Allows bidirectional access to Google Calendar</em:description>
+-    <em:creator>Philipp Kewisch</em:creator>
+-    <em:contributor>Mark James (http://www.famfamfam.com/lab/icons/silk/)</em:contributor>
+-    <em:homepageURL>https://addons.mozilla.org/thunderbird/addon/4631</em:homepageURL>
+-    <em:iconURL>chrome://gdata-provider/content/gcal.png</em:iconURL>
+-  </Description>
+-</RDF>
++{
++  "manifest_version": 2,
++  "name": "Provider for Google Calendar",
++  "description": "Allows bidirectional access to Google Calendar",
++  "version": "@GDATA_VERSION@",
++  "author": "Philipp Kewisch",
++  "homepage_url": "https://addons.mozilla.org/thunderbird/addon/4631",
++  "legacy": true,
++  "applications": {
++    "gecko": {
++      "id": "{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}",
++      "strict_min_version": "@THUNDERBIRD_VERSION@"
++    }
++  },
++  "icons": {
++    "32": "chrome://gdata-provider/content/gcal.png"
++  }
++}
+diff --git a/calendar/providers/gdata/moz.build b/calendar/providers/gdata/moz.build
+--- a/calendar/providers/gdata/moz.build
++++ b/calendar/providers/gdata/moz.build
+@@ -1,16 +1,17 @@
+ # vim: set filetype=python:
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ XPI_NAME = 'gdata-provider'
++export('XPI_NAME')
+ 
+-FINAL_TARGET_PP_FILES += ['install.rdf']
++FINAL_TARGET_PP_FILES += ['manifest.json']
+ 
+ DIRS += [
+     'locales',
+ ]
+ 
+ EXTRA_JS_MODULES += [
+     'modules/calUtilsShim.jsm',
+     'modules/gdataLogging.jsm',
+@@ -23,14 +24,17 @@ EXTRA_JS_MODULES += [
+ 
+ EXTRA_COMPONENTS += [
+     'components/calGoogleCalendar.js',
+     'components/calGoogleCalendar.manifest',
+ ]
+ 
+ JAR_MANIFESTS += ['jar.mn']
+ 
++USE_EXTENSION_MANIFEST = True
++export('USE_EXTENSION_MANIFEST')
++
+ JS_PREFERENCE_FILES += [
+     'defaults/preferences.js',
+ ]
+ 
+ with Files('**'):
+     BUG_COMPONENT = ('Calendar', 'Provider: GData')
+diff --git a/calendar/test/unit/test_gdata_provider.js b/calendar/test/unit/test_gdata_provider.js
+--- a/calendar/test/unit/test_gdata_provider.js
++++ b/calendar/test/unit/test_gdata_provider.js
+@@ -4,22 +4,30 @@
+ 
+ (function() {
+     ChromeUtils.import("resource://gre/modules/Services.jsm");
+     Services.prefs.setBoolPref("javascript.options.showInConsole", true);
+     Services.prefs.setBoolPref("browser.dom.window.dump.enabled", true);
+     Services.prefs.setBoolPref("calendar.debug.log", true);
+     Services.prefs.setBoolPref("calendar.debug.log.verbose", true);
+ 
+-    let bindir = Services.dirsvc.get("CurProcD", Components.interfaces.nsIFile);
+-    bindir.append("extensions");
+-    bindir.append("{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}");
+-    bindir.append("chrome.manifest");
+-    dump("Loading" + bindir.path + "\n");
+-    Components.manager.autoRegister(bindir);
++    let xpiFile;
++    let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
++    if (env.exists("MOZ_FETCHES_DIR")) {
++        xpiFile = new FileUtils.File(env.get("MOZ_FETCHES_DIR"));
++        xpiFile.append("gdata-provider.en-US.xpi");
++    } else {
++        xpiFile = Services.dirsvc.get("CurProcD", Components.interfaces.nsIFile);
++        xpiFile.append("extensions");
++        xpiFile.append("{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}");
++    }
++
++    dump("Loading " + xpiFile.path + "\n");
++    let manager = Cc["@mozilla.org/component-manager-extra;1"].getService(Ci.nsIComponentManagerExtra);
++    manager.addLegacyExtensionManifestLocation(xpiFile);
+ })();
+ 
+ ChromeUtils.import("resource://testing-common/httpd.js");
+ ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+ ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ 
+ ChromeUtils.import("resource://gdata-provider/modules/gdataSession.jsm");
+@@ -502,48 +510,48 @@ function run_test() {
+                     run_next_test();
+                     do_test_finished();
+                 }
+             });
+         }
+     });
+ }
+ 
+-add_task(function* test_migrate_cache() {
++add_task(async function test_migrate_cache() {
+     let uriString = "googleapi://xpcshell/?calendar=xpcshell%40example.com";
+     let uri = Services.io.newURI(uriString);
+     let client = cal.getCalendarManager().createCalendar("gdata", uri);
+     let unwrapped = client.wrappedJSObject;
+     let migrateStorageCache = unwrapped.migrateStorageCache.bind(unwrapped);
+ 
+     monkeyPatch(unwrapped, "resetSync", (protofunc) => {
+         return Promise.resolve();
+     });
+ 
+     // No version, should not reset
+-    equal(yield migrateStorageCache(), false);
++    equal(await migrateStorageCache(), false);
+     equal(client.getProperty("cache.version"), 3);
+ 
+     // Check migrate 1 -> 2
+     unwrapped.CACHE_DB_VERSION = 2;
+     client.setProperty("cache.version", 1);
+-    equal(yield migrateStorageCache(), true);
++    equal(await migrateStorageCache(), true);
+     equal(client.getProperty("cache.version"), 2);
+ 
+     // Check migrate 2 -> 3 normal calendar
+     unwrapped.CACHE_DB_VERSION = 3;
+     client.setProperty("cache.version", 2);
+-    equal(yield migrateStorageCache(), false);
++    equal(await migrateStorageCache(), false);
+ 
+     // Check migrate 2 -> 3 birthday calendar
+     unwrapped.CACHE_DB_VERSION = 3;
+     uri = "googleapi://xpcshell/?calendar=%23contacts%40group.v.calendar.google.com";
+     unwrapped.uri = Services.io.newURI(uri);
+     client.setProperty("cache.version", 2);
+-    equal(yield migrateStorageCache(), true);
++    equal(await migrateStorageCache(), true);
+ });
+ 
+ add_test(function test_migrate_uri() {
+     function checkMigrate(fromUri, session, calendarId, tasksId) {
+         let uri = Services.io.newURI(fromUri);
+         let client = cal.getCalendarManager().createCalendar("gdata", uri);
+ 
+         if (session) {
+@@ -567,17 +575,17 @@ add_test(function test_migrate_uri() {
+                  "example@example.com", "example@example.com", "@default");
+ 
+     checkMigrate("ehmwtf://www.google.com/calendar/feeds/example%40example.com/public/full");
+     checkMigrate("googleapi://session/?calendar=calendarId&tasksId=tasksId");
+ 
+     run_next_test();
+ });
+ 
+-add_task(function* test_dateToJSON() {
++add_task(async function test_dateToJSON() {
+     function _createDateTime(tzid, offset=0) {
+         let offsetFrom = offset <= 0 ? "-0" + (offset - 1) : "+0" + (offset - 1) + "00";
+         let offsetTo = "+0" + offset + "00";
+         let ics = ["BEGIN:VCALENDAR",
+             "BEGIN:VTIMEZONE",
+             "TZID:ThirdPartyZone",
+             "BEGIN:STANDARD",
+             "DTSTART:20071104T020000",
+@@ -666,17 +674,17 @@ add_task(function* test_dateToJSON() {
+     date = _createDateTime("Europe/London");
+     deepEqual(dateToJSON(date), { dateTime: "2015-01-30T12:00:00", timeZone: "Europe/London" });
+ 
+     // date only
+     date.isDate = true;
+     deepEqual(dateToJSON(date), { date: "2015-01-30" });
+ });
+ 
+-add_task(function* test_JSONToDate() {
++add_task(async function test_JSONToDate() {
+     function convert(aEntry, aTimezone="Europe/Berlin") {
+         let tzs = cal.getTimezoneService();
+         let calendarTz = tzs.getTimezone(aTimezone);
+         let date = JSONToDate(aEntry, calendarTz);
+         return date ? date.icalString + " in " + date.timezone.tzid : null;
+     }
+ 
+     // A date, using the passed in default timezone
+@@ -710,75 +718,75 @@ add_task(function* test_JSONToDate() {
+     // An offset matching the passed in calendar timezone. This should NOT be Africa/Algiers
+     equal(convert({ dateTime: "2015-01-02T03:04:05+01:00" }), "20150102T030405 in Europe/Berlin");
+ 
+     // An offset that doesn't match the calendar timezone, will use the first timezone in that offset
+     info("The following warning is expected: 2015-01-02T03:04:05+04:00 does not match timezone offset for Europe/Berlin");
+     equal(convert({ dateTime: "2015-01-02T03:04:05+05:00" }), "20150102T030405 in Antarctica/Mawson");
+ });
+ 
+-add_task(function* test_organizerCN() {
++add_task(async function test_organizerCN() {
+     gServer.events = [];
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     equal(client.getProperty("organizerCN"), null);
+     gServer.resetClient(client);
+ 
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"2299601498276000\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event",
+         creator: gServer.creator,
+         organizer: gServer.creator,
+         start: { dateTime: "2006-06-10T18:00:00+02:00" },
+         end: { dateTime: "2006-06-10T20:00:00+02:00" },
+         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
+     }];
+-    client = yield gServer.getClient();
++    client = await gServer.getClient();
+     equal(client.getProperty("organizerCN"), gServer.creator.displayName);
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_always_readOnly() {
++add_task(async function test_always_readOnly() {
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"2299601498276000\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event",
+         creator: gServer.creator,
+         organizer: gServer.creator,
+         start: { dateTime: "2006-06-10T18:00:00+02:00" },
+         end: { dateTime: "2006-06-10T20:00:00+02:00" },
+         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
+     }];
+     gServer.calendarListData.accessRole = "freeBusyReader";
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client);
+     ok(client.readOnly);
+     client.readOnly = false;
+     ok(client.readOnly);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 1);
+     notEqual(items[0].title, "New Event");
+     gServer.resetClient(client);
+ 
+     gServer.calendarListData.accessRole = "reader";
+-    client = yield gServer.getClient();
++    client = await gServer.getClient();
+     ok(client.readOnly);
+     client.readOnly = false;
+     ok(client.readOnly);
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_reset_sync() {
++add_task(async function test_reset_sync() {
+     gServer.tasks = [{
+         kind: "tasks#task",
+         id: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
+         etag: "\"Lck7VNWFJuXdzMtOmrYPx0KFV2s/LTIwNjA4MDcyNDM\"",
+         title: "New Task",
+         updated: "2014-09-08T16:30:27.000Z",
+         selfLink: gServer.baseUri + "/tasks/v1/lists/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDow/tasks/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
+         position: "00000000000000130998",
+@@ -813,37 +821,37 @@ add_task(function* test_reset_sync() {
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event 2",
+         creator: gServer.creator,
+         organizer: gServer.creator,
+         start: { dateTime: "2006-06-10T18:00:00+02:00" },
+         end: { dateTime: "2006-06-10T20:00:00+02:00" },
+         iCalUID: "fepf8uf6n7n04w7feukucs9n8e@google.com"
+     }];
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let uncached = client.wrappedJSObject.mUncachedCalendar.wrappedJSObject;
+     let pclient = cal.async.promisifyCalendar(client);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 4);
+ 
+     notEqual(client.getProperty("syncToken.events"), "");
+     notEqual(client.getProperty("lastUpdated.tasks"), "");
+ 
+-    yield uncached.resetSync();
+-    items = yield pclient.getAllItems();
++    await uncached.resetSync();
++    items = await pclient.getAllItems();
+     equal(items.length, 0);
+ 
+     equal(client.getProperty("syncToken.events"), "");
+     equal(client.getProperty("lastUpdated.tasks"), "");
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_basicItems() {
++add_task(async function test_basicItems() {
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"2299601498276000\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         status: "confirmed",
+         htmlLink: gServer.baseUri + "/calendar/event?eid=eventhash",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+@@ -897,20 +905,20 @@ add_task(function* test_basicItems() {
+         parent: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo4MDIzOTU2NDc",
+         links: [{
+             link: "mailto:something@example.com",
+             description: "link description",
+             type: "email"
+         }]
+     }];
+ 
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 2);
+ 
+     let event = cal.item.isEvent(items[0]) ? items[0] : items[1];
+     equal(event.id, "go6ijb0b46hlpbu4eeu92njevo@google.com");
+     equal(event.getProperty("STATUS"), "CONFIRMED");
+     equal(event.getProperty("URL"), gServer.baseUri + "/calendar/event?eid=eventhash");
+     equal(event.getProperty("CREATED").icalString, "20060608T210452Z");
+     equal(event.getProperty("LAST-MODIFIED").icalString, "20060608T210549Z");
+@@ -959,18 +967,18 @@ add_task(function* test_basicItems() {
+     equal(attachments.length, 1);
+     equal(attachments[0].uri.spec, "mailto:something@example.com");
+     equal(attachments[0].getParameter("X-GOOGLE-TYPE"), "email");
+     equal(attachments[0].getParameter("FILENAME"), "link description");
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_addModifyDeleteItem() {
+-    let client = yield gServer.getClient();
++add_task(async function test_addModifyDeleteItem() {
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+     equal(gServer.events.length, 0);
+     equal(gServer.tasks.length, 0);
+ 
+     let event = cal.createEvent([
+         "BEGIN:VEVENT",
+         "CREATED:20060608T210452Z",
+         "LAST-MODIFIED:20060608T210549Z",
+@@ -1010,118 +1018,118 @@ add_task(function* test_addModifyDeleteI
+         "DUE;VALUE=DATE:20140904",
+         "COMPLETED:20140901T170000Z",
+         "RELATED-TO;RELTYPE=PARENT:MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo4MDIzOTU2NDc",
+         "ATTACH;FILENAME=\"link description\";X-GOOGLE-TYPE=email:mailto:something@example.com",
+         "END:VTODO"
+     ].join("\r\n"));
+ 
+     // Add an event
+-    let addedEvent = yield pclient.adoptItem(event);
++    let addedEvent = await pclient.adoptItem(event);
+     notEqual(addedEvent.id, null);
+     equal(addedEvent.organizer.id, "mailto:xpcshell@example.com");
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 1);
+     equal(items[0].id, addedEvent.id);
+     equal(items[0].organizer.id, "mailto:xpcshell@example.com");
+ 
+     equal(gServer.events.length, 1);
+     equal(gServer.tasks.length, 0);
+ 
+     // Add a task
+-    let addedTask = yield pclient.adoptItem(task);
++    let addedTask = await pclient.adoptItem(task);
+     notEqual(addedTask.id, null);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 2);
+     equal(items[1].id, addedTask.id);
+ 
+     equal(gServer.events.length, 1);
+     equal(gServer.tasks.length, 1);
+ 
+     // Modify an event
+     let newEvent = items[0].clone();
+     newEvent.title = "changed";
+ 
+-    let modifiedEvent = yield pclient.modifyItem(newEvent, items[0]);
++    let modifiedEvent = await pclient.modifyItem(newEvent, items[0]);
+     equal(modifiedEvent.title, "changed");
+     notEqual(modifiedEvent.getProperty("LAST-MODIFIED"), addedEvent.getProperty("LAST-MODIFIED"));
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 2);
+     equal(items[0].title, "changed");
+     equal(items[0].id, addedEvent.id);
+     equal(items[0].getProperty("LAST-MODIFIED"), modifiedEvent.getProperty("LAST-MODIFIED"));
+     equal(gServer.events.length, 1);
+     equal(gServer.tasks.length, 1);
+ 
+     // Modify a task
+     let newTask = items[1].clone();
+     newTask.title = "changed";
+ 
+-    let modifiedTask = yield pclient.modifyItem(newTask, items[1]);
++    let modifiedTask = await pclient.modifyItem(newTask, items[1]);
+     equal(modifiedTask.title, "changed");
+     notEqual(modifiedTask.getProperty("LAST-MODIFIED"), addedTask.getProperty("LAST-MODIFIED"));
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 2);
+     equal(items[1].title, "changed");
+     equal(items[1].id, addedTask.id);
+     equal(items[1].getProperty("LAST-MODIFIED"), modifiedTask.getProperty("LAST-MODIFIED"));
+     equal(gServer.events.length, 1);
+     equal(gServer.tasks.length, 1);
+ 
+     // Delete an event
+-    yield pclient.deleteItem(modifiedEvent);
+-    items = yield pclient.getAllItems();
++    await pclient.deleteItem(modifiedEvent);
++    items = await pclient.getAllItems();
+     equal(items.length, 1);
+     equal(gServer.events.length, 0);
+     equal(gServer.tasks.length, 1);
+ 
+     // Delete a task
+-    yield pclient.deleteItem(modifiedTask);
+-    items = yield pclient.getAllItems();
++    await pclient.deleteItem(modifiedTask);
++    items = await pclient.getAllItems();
+     equal(items.length, 0);
+     equal(gServer.events.length, 0);
+     equal(gServer.tasks.length, 0);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_recurring_event() {
+-    let client = yield gServer.getClient();
++add_task(async function test_recurring_event() {
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+     let event = cal.createEvent([
+         "BEGIN:VEVENT",
+         "SUMMARY:Recurring Event",
+         "DTSTART:20060610T180000Z",
+         "DTEND:20060610T200000Z",
+         "RRULE:FREQ=WEEKLY",
+         "END:VEVENT"
+     ].join("\r\n"));
+ 
+-    event = yield pclient.addItem(event);
++    event = await pclient.addItem(event);
+     equal(gServer.events.length, 1);
+     equal(gServer.events[0].recurrence.length, 1);
+     equal(gServer.events[0].recurrence[0], "RRULE:FREQ=WEEKLY");
+ 
+     let occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
+     let changedOcc = occ.clone();
+     changedOcc.title = "changed";
+     event.recurrenceInfo.modifyException(occ, true);
+ 
+-    event = yield pclient.modifyItem(changedOcc, occ);
++    event = await pclient.modifyItem(changedOcc, occ);
+     occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
+     equal(occ.title, "changed");
+     equal(gServer.events.length, 2);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_recurring_exception() {
++add_task(async function test_recurring_exception() {
+     gServer.syncs = [{
+         token: "1",
+         events: [{
+             kind: "calendar#event",
+             etag: "\"1\"",
+             id: "go6ijb0b46hlpbu4eeu92njevo",
+             created: "2006-06-08T21:04:52.000Z",
+             updated: "2006-06-08T21:05:49.138Z",
+@@ -1156,41 +1164,41 @@ add_task(function* test_recurring_except
+             start: { dateTime: "2006-06-17T18:00:00+02:00" },
+             end: { dateTime: "2006-06-17T20:00:00+02:00" },
+             status: "cancelled",
+             recurringEventId: "go6ijb0b46hlpbu4eeu92njevo",
+             originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
+         }]
+     }];
+ 
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 1);
+ 
+     let exIds = items[0].recurrenceInfo.getExceptionIds({});
+     equal(exIds.length, 1);
+ 
+     let ex = items[0].recurrenceInfo.getExceptionFor(exIds[0]);
+     equal(ex.title, "New Event changed");
+ 
+     client.refresh();
+-    yield gServer.waitForLoad(client);
++    await gServer.waitForLoad(client);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 1);
+ 
+     exIds = items[0].recurrenceInfo.getExceptionIds({});
+     equal(exIds.length, 0);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_recurring_cancelled_exception() {
++add_task(async function test_recurring_cancelled_exception() {
+     gServer.syncs = [{
+         token: "1",
+         events: [{
+             kind: "calendar#event",
+             etag: "\"1\"",
+             id: "go6ijb0b46hlpbu4eeu92njevo",
+             status: "cancelled",
+         }, {
+@@ -1198,28 +1206,28 @@ add_task(function* test_recurring_cancel
+             etag: "\"2\"",
+             id: "go6ijb0b46hlpbu4eeu92njevo_20060617T160000Z",
+             status: "cancelled",
+             recurringEventId: "go6ijb0b46hlpbu4eeu92njevo",
+             originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
+         }]
+     }];
+ 
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 0);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_import_invitation() {
++add_task(async function test_import_invitation() {
+     Preferences.set("calendar.google.enableAttendees", true);
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+     let event = cal.createEvent([
+         "BEGIN:VEVENT",
+         "UID:xpcshell-import",
+         "CREATED:20060608T210452Z",
+         "LAST-MODIFIED:20060608T210549Z",
+         "DTSTAMP:20060608T210549Z",
+         "SUMMARY:New Event",
+@@ -1230,24 +1238,24 @@ add_task(function* test_import_invitatio
+         "ATTENDEE;CN=Eggs P. Seashell;PARTSTAT=TENTATIVE;CUTYPE=INDIVIDUAL;",
+         " ROLE=REQ-PARTICIPANT:mailto:xpcshell@example.com",
+         "DTSTART:20060610T180000Z",
+         "DTEND:20060610T200000Z",
+         "SEQUENCE:1",
+         "END:VEVENT"
+     ].join("\r\n"));
+ 
+-    let addedItem = yield pclient.adoptItem(event);
++    let addedItem = await pclient.adoptItem(event);
+     equal(gServer.events.length, 1);
+     equal(addedItem.icalString, event.icalString);
+     gServer.resetClient(client);
+     Preferences.set("calendar.google.enableAttendees", false);
+ });
+ 
+-add_task(function* test_modify_invitation() {
++add_task(async function test_modify_invitation() {
+     Preferences.set("calendar.google.enableAttendees", true);
+     let organizer = {
+         displayName: "organizer name",
+         email: "organizer@example.com",
+         organizer: true,
+         responseStatus: "tentative"
+     };
+     let attendee = Object.assign({}, gServer.creator);
+@@ -1272,36 +1280,36 @@ add_task(function* test_modify_invitatio
+         transparency: "transparent",
+         visibility: "private",
+         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com",
+         sequence: 1,
+         attendees: [organizer, attendee],
+     }];
+ 
+     // Case #1: User is attendee
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 1);
+ 
+     let item = items[0];
+     let att = cal.itip.getInvitedAttendee(item);
+     let newItem = item.clone();
+ 
+     notEqual(att, null);
+     equal(att.id, "mailto:" + attendee.email);
+     equal(att.participationStatus, "NEEDS-ACTION");
+ 
+     newItem.removeAttendee(att);
+     att = att.clone();
+     att.participationStatus = "ACCEPTED";
+     newItem.addAttendee(att);
+ 
+-    yield pclient.modifyItem(newItem, items[0]);
++    await pclient.modifyItem(newItem, items[0]);
+     equal(gServer.lastMethod, "PATCH");
+ 
+     // Case #2: User is organizer
+     let events = gServer.events;
+     gServer.resetClient(client);
+     gServer.events = events;
+ 
+     organizer = Object.assign({}, gServer.creator);
+@@ -1312,42 +1320,42 @@ add_task(function* test_modify_invitatio
+         email: "attendee@example.com",
+         responseStatus: "tentative"
+     };
+ 
+     gServer.events[0].organizer = gServer.creator;
+     gServer.events[0].creator = gServer.creator;
+     gServer.events[0].attendees = [organizer, attendee];
+ 
+-    client = yield gServer.getClient();
++    client = await gServer.getClient();
+     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 1);
+ 
+     item = items[0];
+     let org = item.getAttendeeById("mailto:" + organizer.email);
+     newItem = item.clone();
+ 
+     notEqual(org, null);
+     equal(org.id, "mailto:" + organizer.email);
+     equal(org.participationStatus, "ACCEPTED");
+ 
+     newItem.removeAttendee(org);
+     org = org.clone();
+     org.participationStatus = "TENTATIVE";
+     newItem.addAttendee(org);
+ 
+-    modifiedItem = yield pclient.modifyItem(newItem, items[0]);
++    modifiedItem = await pclient.modifyItem(newItem, items[0]);
+     equal(gServer.lastMethod, "PUT");
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_metadata() {
++add_task(async function test_metadata() {
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"1\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event",
+         creator: gServer.creator,
+@@ -1361,91 +1369,91 @@ add_task(function* test_metadata() {
+         id: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
+         etag: "\"2\"",
+         title: "New Task",
+         updated: "2014-09-08T16:30:27.000Z",
+         selfLink: gServer.baseUri + "/tasks/v1/lists/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDow/tasks/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
+         notes: "description"
+     }];
+ 
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let offline = client.wrappedJSObject.mCachedCalendar;
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+     // Check initial metadata
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     let meta = getAllMeta(offline);
+     let [event, task] = items;
+     ok(cal.item.isEvent(event));
+     ok(cal.item.isToDo(task));
+     equal(meta.size, 2);
+     equal(meta.get(event.hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+     equal(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+ 
+     // Modify an event
+     gServer.nextEtag = '"3"';
+     let newEvent = event.clone();
+     newEvent.title = "changed";
+-    yield pclient.modifyItem(newEvent, event);
++    await pclient.modifyItem(newEvent, event);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     meta = getAllMeta(offline);
+     [event, task] = items;
+     ok(cal.item.isEvent(event));
+     ok(cal.item.isToDo(task));
+     equal(meta.size, 2);
+     equal(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+     equal(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+ 
+     // Modify a task
+     gServer.nextEtag = '"4"';
+     let newTask = task.clone();
+     newTask.title = "changed";
+-    yield pclient.modifyItem(newTask, task);
++    await pclient.modifyItem(newTask, task);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     meta = getAllMeta(offline);
+     [event, task] = items;
+     equal(meta.size, 2);
+     equal(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+     equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+ 
+     // Delete an event
+-    yield pclient.deleteItem(event);
++    await pclient.deleteItem(event);
+     meta = getAllMeta(offline);
+     equal(meta.size, 1);
+     equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+ 
+     // Delete a task
+-    yield pclient.deleteItem(task);
++    await pclient.deleteItem(task);
+     meta = getAllMeta(offline);
+     equal(meta.size, 0);
+ 
+     // Add an event
+     gServer.nextEtag = '"6"';
+-    newEvent = yield pclient.addItem(event);
++    newEvent = await pclient.addItem(event);
+     meta = getAllMeta(offline);
+     equal(meta.size, 1);
+     equal(gServer.events.length, 1);
+     equal(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
+ 
+     // Add a task
+     gServer.nextEtag = '"7"';
+-    newTask = yield pclient.addItem(task);
++    newTask = await pclient.addItem(task);
+     meta = getAllMeta(offline);
+     equal(meta.size, 2);
+     equal(gServer.events.length, 1);
+     equal(gServer.tasks.length, 1);
+     equal(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
+     equal(meta.get(newTask.hashId), ['"7"', gServer.tasks[0].id, false].join("\u001A"));
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_metadata_recurring() {
++add_task(async function test_metadata_recurring() {
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"1\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event",
+         creator: gServer.creator,
+@@ -1471,145 +1479,145 @@ add_task(function* test_metadata_recurri
+         id: "go6ijb0b46hlpbu4eeu92njevo_20060617T160000Z",
+         summary: "New Event next week",
+         start: { dateTime: "2006-06-17T18:00:00+02:00" },
+         end: { dateTime: "2006-06-17T20:00:00+02:00" },
+         recurringEventId: "go6ijb0b46hlpbu4eeu92njevo",
+         originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
+     }];
+ 
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let offline = client.wrappedJSObject.mCachedCalendar;
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+ 
+     let meta = getAllMeta(offline);
+     equal(meta.size, 3);
+     equal(meta.get(items[0].hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+ 
+     // The exception metadata should also exist
+     let exIds = items[0].recurrenceInfo.getExceptionIds({});
+     equal(exIds.length, 2);
+     let ex = items[0].recurrenceInfo.getExceptionFor(exIds[0]);
+     equal(meta.get(ex.hashId), ['"2"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
+ 
+     // Changing an exception should retain the metadata entries
+     let newEx = ex.clone();
+     newEx.title = "New Event changed again";
+     gServer.nextEtag = '"4"';
+-    yield pclient.modifyItem(newEx, ex);
++    await pclient.modifyItem(newEx, ex);
+     meta = getAllMeta(offline);
+     equal(meta.size, 3);
+     equal(meta.get(newEx.hashId), ['"4"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
+ 
+     // Deleting an exception should delete the metadata, as it turns into an EXDATE
+     let newItem = items[0].clone();
+     newItem.recurrenceInfo.removeOccurrenceAt(exIds[0]);
+-    yield pclient.modifyItem(newItem, items[0]);
++    await pclient.modifyItem(newItem, items[0]);
+ 
+     meta = getAllMeta(offline);
+     equal(meta.size, 2);
+ 
+     // Deleting the master item should remove all metadata entries
+-    yield pclient.deleteItem(items[0]);
++    await pclient.deleteItem(items[0]);
+     meta = getAllMeta(offline);
+     equal(meta.size, 0);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_conflict_modify() {
++add_task(async function test_conflict_modify() {
+     // TODO task/event conflicts are handled in the same way so I'm going to
+     // skip adding tests for tasks here, but it probably wouldn't hurt to
+     // create them at some point.
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"1\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event",
+         creator: gServer.creator,
+         organizer: gServer.creator,
+         start: { dateTime: "2006-06-10T18:00:00+02:00" },
+         end: { dateTime: "2006-06-10T20:00:00+02:00" },
+         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
+     }];
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+-    let item = (yield pclient.getAllItems())[0];
++    let item = (await pclient.getAllItems())[0];
+ 
+     // Case #1: Modified on server, modify locally, overwrite conflict
+     MockConflictPrompt.overwrite = true;
+     let newItem = item.clone();
+     newItem.title = "local change";
+     gServer.events[0].etag = '"2"';
+     gServer.events[0].summary = "remote change";
+-    let modifiedItem = yield pclient.modifyItem(newItem, item);
+-    item = (yield pclient.getAllItems())[0];
++    let modifiedItem = await pclient.modifyItem(newItem, item);
++    item = (await pclient.getAllItems())[0];
+     equal(gServer.events[0].summary, "local change");
+     notEqual(gServer.events[0].etag, '"2"');
+     equal(item.title, "local change");
+     equal(modifiedItem.title, "local change");
+     equal(gServer.events.length, 1);
+ 
+     // Case #2: Modified on server, modify locally, don't overwrite conflict
+     MockConflictPrompt.overwrite = false;
+     gServer.events[0].etag = '"3"';
+     gServer.events[0].summary = "remote change";
+     try {
+-        modifiedItem = yield pclient.modifyItem(newItem, item);
++        modifiedItem = await pclient.modifyItem(newItem, item);
+         do_throw("Expected modifyItem to be cancelled");
+     } catch (e) {
+         // Swallow cancelling the request
+         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
+             throw e;
+         }
+     }
+ 
+-    yield gServer.waitForLoad(client);
++    await gServer.waitForLoad(client);
+ 
+-    item = (yield pclient.getAllItems())[0];
++    item = (await pclient.getAllItems())[0];
+     equal(gServer.events[0].summary, "remote change");
+     equal(gServer.events[0].etag, '"3"');
+     equal(item.title, "remote change");
+ 
+     // Case #3: Modified on server, delete locally, don't overwrite conflict
+     MockConflictPrompt.overwrite = false;
+     gServer.events[0].etag = '"4"';
+     gServer.events[0].summary = "remote change";
+     try {
+-        yield pclient.deleteItem(item);
++        await pclient.deleteItem(item);
+         do_throw("Expected deleteItem to be cancelled");
+     } catch (e) {
+         // Swallow cancelling the request
+         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
+             throw e;
+         }
+     }
+ 
+-    yield gServer.waitForLoad(client);
++    await gServer.waitForLoad(client);
+ 
+-    item = (yield pclient.getAllItems())[0];
++    item = (await pclient.getAllItems())[0];
+     equal(gServer.events[0].summary, "remote change");
+     equal(gServer.events[0].etag, '"4"');
+     equal(item.title, "remote change");
+ 
+     // Case #4: Modified on server, delete locally, overwrite conflict
+     MockConflictPrompt.overwrite = true;
+     gServer.events[0].etag = '"5"';
+     gServer.events[0].summary = "remote change";
+-    yield pclient.deleteItem(item);
+-    item = (yield pclient.getAllItems())[0];
++    await pclient.deleteItem(item);
++    item = (await pclient.getAllItems())[0];
+     equal(gServer.events.length, 0);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_conflict_delete() {
++add_task(async function test_conflict_delete() {
+     // TODO task/event conflicts are handled in the same way so I'm going to
+     // skip adding tests for tasks here, but it probably wouldn't hurt to
+     // create them at some point.
+     let coreEvent = {
+         kind: "calendar#event",
+         etag: "\"2\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+@@ -1619,100 +1627,100 @@ add_task(function* test_conflict_delete(
+         organizer: gServer.creator,
+         start: { dateTime: "2006-06-10T18:00:00+02:00" },
+         end: { dateTime: "2006-06-10T20:00:00+02:00" },
+         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
+     };
+ 
+     // Load intial event to server
+     gServer.events = [coreEvent];
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+-    let item = (yield pclient.getAllItems())[0];
++    let item = (await pclient.getAllItems())[0];
+ 
+     // Case #1: Deleted on server, modify locally, overwrite conflict
+     MockConflictPrompt.overwrite = true;
+     gServer.events = [];
+     let newItem = item.clone();
+     newItem.title = "local change";
+-    let modifiedItem = yield pclient.modifyItem(newItem, item);
+-    item = (yield pclient.getAllItems())[0];
++    let modifiedItem = await pclient.modifyItem(newItem, item);
++    item = (await pclient.getAllItems())[0];
+     equal(gServer.events[0].summary, "local change");
+     notEqual(gServer.events[0].etag, '"2"');
+     equal(item.title, "local change");
+     equal(modifiedItem.title, "local change");
+     equal(gServer.events.length, 1);
+ 
+     // Case #2: Deleted on server, modify locally, don't overwrite conflict
+     MockConflictPrompt.overwrite = false;
+     gServer.events = [];
+     try {
+-        modifiedItem = yield pclient.modifyItem(newItem, item);
++        modifiedItem = await pclient.modifyItem(newItem, item);
+         do_throw("Expected modifyItem to be cancelled");
+     } catch (e) {
+         // Swallow cancelling the request
+         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
+             throw e;
+         }
+     }
+     // The next synchronize should cause the event to be deleted locally.
+     coreEvent.status = "cancelled";
+     gServer.events = [coreEvent];
+ 
+-    yield gServer.waitForLoad(client);
++    await gServer.waitForLoad(client);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 0);
+     equal(gServer.events.length, 1);
+ 
+     // Put the event back in the calendar for the next run
+     delete gServer.events[0].status;
+     client.refresh();
+-    yield gServer.waitForLoad(client);
+-    items = yield pclient.getAllItems();
++    await gServer.waitForLoad(client);
++    items = await pclient.getAllItems();
+     equal(items.length, 1);
+ 
+     // Case #3: Deleted on server, delete locally, don't overwrite conflict
+     MockConflictPrompt.overwrite = false;
+     gServer.events = [];
+     try {
+-        yield pclient.deleteItem(item);
++        await pclient.deleteItem(item);
+         do_throw("Expected deleteItem to be cancelled");
+     } catch (e) {
+         // Swallow cancelling the request
+         if (e != Components.interfaces.calIErrors.OPERATION_CANCELLED) {
+             throw e;
+         }
+     }
+     // The next synchronize should cause the event to be deleted locally.
+     coreEvent.status = "cancelled";
+     gServer.events = [coreEvent];
+-    yield gServer.waitForLoad(client);
++    await gServer.waitForLoad(client);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 0);
+ 
+     // Put the event back in the calendar for the next run
+     delete gServer.events[0].status;
+     client.refresh();
+-    yield gServer.waitForLoad(client);
+-    items = yield pclient.getAllItems();
++    await gServer.waitForLoad(client);
++    items = await pclient.getAllItems();
+     equal(items.length, 1);
+ 
+     // Case #4: Deleted on server, delete locally, overwrite conflict
+     MockConflictPrompt.overwrite = true;
+     gServer.events = [];
+-    yield pclient.deleteItem(item);
+-    items = yield pclient.getAllItems();
++    await pclient.deleteItem(item);
++    items = await pclient.getAllItems();
+     equal(items.length, 0);
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_default_alarms() {
++add_task(async function test_default_alarms() {
+     let defaultReminders = [
+         { method: "popup", minutes: 10 },
+         { method: "email", minutes: 20 },
+     ];
+     gServer.calendarListData.defaultReminders = defaultReminders;
+     gServer.eventsData.defaultReminders = defaultReminders;
+     gServer.events = [{
+         kind: "calendar#event",
+@@ -1725,21 +1733,21 @@ add_task(function* test_default_alarms()
+         organizer: gServer.creator,
+         start: { dateTime: "2006-06-10T18:00:00+02:00" },
+         end: { dateTime: "2006-06-10T20:00:00+02:00" },
+         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com",
+         reminders: { useDefault: true }
+     }];
+ 
+     // Case #1: read default alarms from event stream
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+     equal(client.getProperty("settings.defaultReminders"), JSON.stringify(defaultReminders));
+ 
+-    let item = (yield pclient.getAllItems())[0];
++    let item = (await pclient.getAllItems())[0];
+     let alarms = item.getAlarms({});
+ 
+     equal(alarms.length, 2);
+     ok(alarms.every(x => x.getProperty("X-DEFAULT-ALARM") == "TRUE"));
+     equal(alarms[0].action, "DISPLAY");
+     equal(alarms[0].offset.icalString, "-PT10M");
+     equal(alarms[1].action, "EMAIL");
+     equal(alarms[1].offset.icalString, "-PT20M");
+@@ -1754,17 +1762,17 @@ add_task(function* test_default_alarms()
+         "X-DEFAULT-ALARM:TRUE",
+         "ACTION:DISPLAY",
+         "TRIGGER;VALUE=DURATION:PT0S",
+         "DESCRIPTION:Description",
+         "END:VALARM",
+         "END:VEVENT"
+     ].join("\r\n"));
+ 
+-    yield pclient.addItem(event);
++    await pclient.addItem(event);
+     ok(gServer.events[1].reminders.useDefault);
+     equal(gServer.events[1].reminders.overrides.length, 0);
+ 
+     // Case #3: Mixed default/non-default alarms. Not sure this will happen
+     event = cal.createEvent([
+         "BEGIN:VEVENT",
+         "SUMMARY:Default Alarms",
+         "DTSTART:20060610T180000Z",
+@@ -1778,57 +1786,57 @@ add_task(function* test_default_alarms()
+         "BEGIN:VALARM",
+         "ACTION:DISPLAY",
+         "TRIGGER;VALUE=DURATION:-PT5M",
+         "DESCRIPTION:Description",
+         "END:VALARM",
+         "END:VEVENT"
+     ].join("\r\n"));
+ 
+-    yield pclient.addItem(event);
++    await pclient.addItem(event);
+     ok(gServer.events[2].reminders.useDefault);
+     equal(gServer.events[2].reminders.overrides.length, 1);
+     equal(gServer.events[2].reminders.overrides[0].minutes, 5);
+ 
+     gServer.resetClient(client);
+ 
+     // Case #4a: Empty default alarms
+     gServer.calendarListData.defaultReminders = [];
+     gServer.eventsData.defaultReminders = [];
+-    client = yield gServer.getClient();
++    client = await gServer.getClient();
+     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+     event = cal.createEvent([
+         "BEGIN:VEVENT",
+         "SUMMARY:Default Alarms Empty",
+         "DTSTART:20060610T180000Z",
+         "DTEND:20060610T200000Z",
+         "X-DEFAULT-ALARM:TRUE",
+         "END:VEVENT"
+     ].join("\r\n"));
+ 
+-    yield pclient.addItem(event);
++    await pclient.addItem(event);
+     ok(gServer.events[0].reminders.useDefault);
+     equal(gServer.events[0].reminders.overrides, undefined);
+ 
+     let events = gServer.events;
+     gServer.resetClient(client);
+ 
+     // Case #4b: Read an item with empty default alarms
+     gServer.events = events;
+-    client = yield gServer.getClient();
++    client = await gServer.getClient();
+     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
+ 
+-    item = (yield pclient.getAllItems())[0];
++    item = (await pclient.getAllItems())[0];
+     equal(item.getProperty("X-DEFAULT-ALARM"), "TRUE");
+ 
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_paginate() {
++add_task(async function test_paginate() {
+     gServer.events = [{
+         kind: "calendar#event",
+         etag: "\"1\"",
+         id: "go6ijb0b46hlpbu4eeu92njevo",
+         created: "2006-06-08T21:04:52.000Z",
+         updated: "2006-06-08T21:05:49.138Z",
+         summary: "New Event",
+         creator: gServer.creator,
+@@ -1867,35 +1875,35 @@ add_task(function* test_paginate() {
+         updated: "2014-09-08T16:30:27.000Z",
+         selfLink: gServer.baseUri + "/tasks/v1/lists/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDow/tasks/MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo5OTU0Mjk2MzQ",
+         position: "00000000000000130993",
+         status: "needsAction"
+     }];
+ 
+     Preferences.set("calendar.google.maxResultsPerRequest", 1);
+ 
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client);
+ 
+     // Make sure all pages were requested
+     equal(gServer.eventsData.nextPageToken, null);
+     equal(gServer.tasksData.nextPageToken, null);
+ 
+     // ...and we have all items. Not checking props
+     // because the other tests do this sufficiently.
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 4);
+ 
+     equal(client.getProperty("syncToken.events"), "next-sync-token");
+ 
+     Preferences.reset("calendar.google.maxResultsPerRequest");
+     gServer.resetClient(client);
+ });
+ 
+-add_task(function* test_incremental_reset() {
++add_task(async function test_incremental_reset() {
+     gServer.syncs = [{
+         token: "1",
+         events: [{
+             kind: "calendar#event",
+             etag: "\"1\"",
+             id: "go6ijb0b46hlpbu4eeu92njevo",
+             created: "2006-06-08T21:04:52.000Z",
+             updated: "2006-06-08T21:05:49.138Z",
+@@ -1920,27 +1928,27 @@ add_task(function* test_incremental_rese
+             summary: "New Event 2",
+             creator: gServer.creator,
+             organizer: gServer.creator,
+             start: { dateTime: "2006-06-10T18:00:00+02:00" },
+             end: { dateTime: "2006-06-10T20:00:00+02:00" },
+             iCalUID: "fepf8uf6n7n04w7feukucs9n8e@google.com"
+         }]
+     }];
+-    let client = yield gServer.getClient();
++    let client = await gServer.getClient();
+     let pclient = cal.async.promisifyCalendar(client);
+ 
+-    let items = yield pclient.getAllItems();
++    let items = await pclient.getAllItems();
+     equal(items.length, 1);
+     equal(items[0].title, "New Event");
+ 
+     client.refresh();
+-    yield gServer.waitForLoad(client);
++    await gServer.waitForLoad(client);
+ 
+-    items = yield pclient.getAllItems();
++    items = await pclient.getAllItems();
+     equal(items.length, 1);
+     equal(items[0].title, "New Event 2");
+ 
+     equal(gServer.syncs.length, 0);
+     equal(client.getProperty("syncToken.events"), "last");
+ 
+     gServer.resetClient(client);
+ });
+diff --git a/calendar/test/unit/xpcshell-shared.ini b/calendar/test/unit/xpcshell-shared.ini
+--- a/calendar/test/unit/xpcshell-shared.ini
++++ b/calendar/test/unit/xpcshell-shared.ini
+@@ -24,18 +24,18 @@
+ [test_datetime_before_1970.js]
+ [test_datetimeformatter.js]
+ [test_deleted_items.js]
+ [test_duration.js]
+ [test_extract.js]
+ [test_email_utils.js]
+ [test_freebusy.js]
+ [test_freebusy_service.js]
+-#[test_gdata_provider.js]
+-#requesttimeoutfactor = 2
++[test_gdata_provider.js]
++requesttimeoutfactor = 2
+ [test_hashedarray.js]
+ [test_ics.js]
+ [test_ics_parser.js]
+ [test_ics_service.js]
+ [test_imip.js]
+ [test_items.js]
+ [test_ltninvitationutils.js]
+ [test_providers.js]
+diff --git a/mail/app.mozbuild b/mail/app.mozbuild
+--- a/mail/app.mozbuild
++++ b/mail/app.mozbuild
+@@ -16,16 +16,17 @@ if CONFIG['MOZ_EXTENSIONS']:
+     DIRS += ['/%s/extensions' % CONFIG['mozreltopsrcdir']]
+ 
+ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
+ 
+ 
+ if CONFIG['MOZ_CALENDAR']:
+     DIRS += [
+         '/%s/calendar/lightning' % CONFIG['commreltopsrcdir'],
+-        '/%s/calendar/timezones' % CONFIG['commreltopsrcdir']
++        '/%s/calendar/providers/gdata' % CONFIG['commreltopsrcdir'],
++        '/%s/calendar/timezones' % CONFIG['commreltopsrcdir'],
+     ]
+ 
+ DIRS += [
+     '/%s/chat' % CONFIG['commreltopsrcdir'],
+     '/%s/editor/ui' % CONFIG['commreltopsrcdir'],
+     '/%s/mail' % CONFIG['commreltopsrcdir'],
+ ]
+diff --git a/mail/testsuite-targets.mk b/mail/testsuite-targets.mk
+--- a/mail/testsuite-targets.mk
++++ b/mail/testsuite-targets.mk
+@@ -56,10 +56,11 @@ else
+ package-tests: stage-mozmill
+ endif
+ 
+ stage-mozmill: make-stage-dir
+ 	$(MAKE) -C $(commtopobjdir)/mail/test/mozmill stage-package
+ 
+ stage-calendar: make-stage-dir
+ 	$(MAKE) -C $(commtopobjdir)/calendar/lightning stage-package
++	$(MAKE) -C $(commtopobjdir)/calendar/providers/gdata stage-package
+ 
+ .PHONY: stage-mozmill stage-calendar
+diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
+--- a/taskcluster/ci/test/tests.yml
++++ b/taskcluster/ci/test/tests.yml
+@@ -66,16 +66,19 @@ xpcshell:
+                     - remove_executables.py
+                     - unittests/thunderbird_extra.py
+         extra-options:
+             - "--xpcshell-suite=xpcshell"
+         requires-signed-builds:
+             by-test-platform:
+                 windows.*: true
+                 default: false
++    fetches:
++        build:
++            - gdata-provider.en-US.xpi
+ 
+ mozmill:
+     description: "mozmill test run"
+     suite: mozmill
+     treeherder-symbol: Z(Z)
+     run-on-projects: built-projects
+     docker-image:
+         in-tree: "desktop1604-test"
+

diff --git a/mail-client/thunderbird/thunderbird-60.0.ebuild b/mail-client/thunderbird/thunderbird-60.0.ebuild
index ac2b358..28892cf 100644
--- a/mail-client/thunderbird/thunderbird-60.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.8"
-MOZ_LIGHTNING_GDATA_VER="3.3"
+MOZ_LIGHTNING_VER="6.2"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
@@ -27,7 +27,6 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 MOZ_P="${PN}-${MOZ_PV}"
 
-#MOZCONFIG_OPTIONAL_GTK2ONLY=1
 MOZCONFIG_OPTIONAL_WIFI=1
 #MOZ_GENERATE_LANGPACKS=1
 
@@ -39,7 +38,6 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-#IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
 IUSE="bindist crypt hardened lightning +minimal mozdom rust selinux"
 RESTRICT="!bindist? ( bindist )"
 
@@ -139,6 +137,7 @@ src_prepare() {
 	# Apply our Thunderbird patchset
 	pushd "${S}"/comm &>/dev/null || doe
 	eapply "${FILESDIR}"/1000_fix_gentoo_preferences.patch
+	eapply "${FILESDIR}"/tb60-build-gdata-provider.patch
 
 	# simulate old directory structure just in case it helps eapply_user
 	ln -s .. mozilla || die
@@ -147,17 +146,17 @@ src_prepare() {
 	# remove the symlink
 	rm -f mozilla
 
-	popd &>/dev/null || die
-
 	# Confirm the version of lightning being grabbed for langpacks is the same
 	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
 	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
 		eqawarn "The version of lightning used for localization differs from the version"
 		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
 		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
 	fi
 
+	popd &>/dev/null || die
+
 	eautoreconf old-configure.in
 	# Ensure we run eautoreconf in spidermonkey to regenerate configure
 	cd "${S}"/js/src || die
@@ -294,12 +293,13 @@ src_install() {
 
 	local emid
 	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
 		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
 
 	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
 	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
 	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
 	doins -r "${T}/${emid}"
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2016-10-11 14:13 Ian Stakenvicius
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Stakenvicius @ 2016-10-11 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     275f28d779e7632bbd1501ca5813d90b3300cd6f
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 01:26:20 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 01:26:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=275f28d7

mail-client/thunderbird: moved gcc6 and binutils-2.26 patches to tarball

 mail-client/thunderbird/Manifest                   |  2 +-
 .../firefox-45-binutils-2.26-gold-elfhack.patch    | 49 ----------------------
 .../thunderbird/files/firefox-45-gcc6.patch        | 40 ------------------
 .../thunderbird/thunderbird-45.4.0-r1.ebuild       |  6 +--
 4 files changed, 3 insertions(+), 94 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 797685c..22abc56 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,5 @@
 DIST enigmail-1.9.1.tar.gz 1736876 SHA256 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512 5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c WHIRLPOOL 80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a
-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 gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
 DIST lightning-4.7.4.tar.xz 1927800 SHA256 24310e7ef2e5dfdf35c52cce4480553c1641368558f1c388e8ba3a99d4c8f2f2 SHA512 65b398d71897a942cae30924de15ae47e2fed83cb70a58b3d99271246eaaabf48703a1b8b5ea74799bf66a4908df56ae2fa75422f62979036f1d322fe77fdae1 WHIRLPOOL 499deb17bf2cb28b028dd68f41c973185282703dc87963ae5df60d81f8e8004feda9a9e5ec202f94ddf87249402e78679330ddd74e51347a12702d005d2ddf38
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0

diff --git a/mail-client/thunderbird/files/firefox-45-binutils-2.26-gold-elfhack.patch b/mail-client/thunderbird/files/firefox-45-binutils-2.26-gold-elfhack.patch
deleted file mode 100644
index 1e7fa1c..0000000
--- a/mail-client/thunderbird/files/firefox-45-binutils-2.26-gold-elfhack.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4d0fe8f40364c170226f1ef3bc98975630463e87 Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Tue, 19 Jan 2016 14:31:04 +0900
-Subject: [PATCH] Bug 1233963 - Work around recent GNU gold behavior with
- segments starting before the first section they contain
-
----
- build/unix/elfhack/elf.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp
-index 666b535..743afde 100644
---- a/build/unix/elfhack/elf.cpp
-+++ b/build/unix/elfhack/elf.cpp
-@@ -253,26 +253,29 @@ Elf::Elf(std::ifstream &file)
-         }
-         if (phdr.p_type == PT_PHDR)
-             segment->addSection(phdr_section);
-         for (int j = 1; j < ehdr->e_shnum; j++)
-             if (phdr.contains(sections[j]))
-                 segment->addSection(sections[j]);
-         // Make sure that our view of segments corresponds to the original
-         // ELF file.
--        assert(segment->getFileSize() == phdr.p_filesz);
-+        // GNU gold likes to start some segments before the first section
-+        // they contain. https://sourceware.org/bugzilla/show_bug.cgi?id=19392
-+        unsigned int gold_adjustment = segment->getAddr() - phdr.p_vaddr;
-+        assert(segment->getFileSize() == phdr.p_filesz - gold_adjustment);
-         // gold makes TLS segments end on an aligned virtual address, even
-         // when the underlying section ends before that, while bfd ld
-         // doesn't. It's fine if we don't keep that alignment.
-         unsigned int memsize = segment->getMemSize();
-         if (phdr.p_type == PT_TLS && memsize != phdr.p_memsz) {
-             unsigned int align = segment->getAlign();
-             memsize = (memsize + align - 1) & ~(align - 1);
-         }
--        assert(memsize == phdr.p_memsz);
-+        assert(memsize == phdr.p_memsz - gold_adjustment);
-         segments.push_back(segment);
-     }
- 
-     new (&eh_entry) ElfLocation(ehdr->e_entry, this);
- }
- 
- Elf::~Elf()
- {
--- 
-2.7.0
-

diff --git a/mail-client/thunderbird/files/firefox-45-gcc6.patch b/mail-client/thunderbird/files/firefox-45-gcc6.patch
deleted file mode 100644
index c5b861c..0000000
--- a/mail-client/thunderbird/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/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild b/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild
index a74e343..78d5a44 100644
--- a/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild
@@ -22,7 +22,7 @@ EMVER="1.9.1"
 
 # Patches
 PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-06"
+PATCHFF="firefox-45.0-patches-07"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
@@ -143,9 +143,7 @@ src_prepare() {
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}/firefox" \
-		"${FILESDIR}"/firefox-45-binutils-2.26-gold-elfhack.patch \
-		"${FILESDIR}"/firefox-45-gcc6.patch
+	eapply "${WORKDIR}/firefox"
 	popd &>/dev/null || die
 
 	# Ensure that are plugins dir is enabled as default


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
@ 2016-08-31 19:10 Ian Stakenvicius
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Stakenvicius @ 2016-08-31 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     ad150c6ee2c1b21f746fb91f7819e2f0f6ad5874
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 19:09:54 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 19:09:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ad150c6e

mail-client/thunderbird-45.3.0: patch to fix gcc6 compilation

 .../thunderbird/files/firefox-45-gcc6.patch        | 40 ++++++++++++++++++++++
 mail-client/thunderbird/thunderbird-45.3.0.ebuild  |  3 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/mail-client/thunderbird/files/firefox-45-gcc6.patch b/mail-client/thunderbird/files/firefox-45-gcc6.patch
new file mode 100644
index 0000000..c5b861c
--- /dev/null
+++ b/mail-client/thunderbird/files/firefox-45-gcc6.patch
@@ -0,0 +1,40 @@
+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/mail-client/thunderbird/thunderbird-45.3.0.ebuild b/mail-client/thunderbird/thunderbird-45.3.0.ebuild
index 84ebec5..f85141b 100644
--- a/mail-client/thunderbird/thunderbird-45.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.3.0.ebuild
@@ -144,7 +144,8 @@ src_prepare() {
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}/firefox"
+	eapply "${WORKDIR}/firefox" \
+		"${FILESDIR}"/firefox-45-gcc6.patch
 	popd &>/dev/null || die
 
 	# Ensure that are plugins dir is enabled as default


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-03-01 23:03 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-01 14:20 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/ Jory Pratt
  -- strict thread matches above, loose matches on Subject: below --
2020-03-01 23:03 Jory Pratt
2019-11-22 21:55 Jory Pratt
2019-09-29  1:36 Jory Pratt
2019-08-30  1:41 Jory Pratt
2018-12-03 20:15 Ian Stakenvicius
2018-08-15 17:18 Ian Stakenvicius
2018-08-14  0:25 Ian Stakenvicius
2016-10-11 14:13 Ian Stakenvicius
2016-08-31 19:10 Ian Stakenvicius

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox