[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: 631a1bd2e5f99b52cc4862a3d9e78b15f29c53cd Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Nov 3 16:57:51 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Nov 3 17:05:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631a1bd2 mail-client/thunderbird: bump to v91.3.0 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> mail-client/thunderbird/Manifest | 65 ++ mail-client/thunderbird/files/thunderbird-r1.sh | 116 +++ mail-client/thunderbird/metadata.xml |1 + mail-client/thunderbird/thunderbird-91.3.0.ebuild | 1114 + 4 files changed, 1296 insertions(+) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 6e56a2b98b0..a69ffbcf45c 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,5 +1,6 @@ DIST firefox-78esr-patches-16.tar.xz 55964 BLAKE2B 79d3a465c69656bb55ee7c1e9060606464b6404435b92f534db275521ac2343e045feae1fff6166fde9e2599a82cd982b0b2395271b1033f0f784e745e2c6965 SHA512 3aa971c726646cbf37a14a0dba6c4ac966b88db655cd8b730c5572543bfbf682991ee7c139889541e4f6936c13f27233dc1837fbdb9ee340b33ebb2cec59b01f DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a695f52c4712f3b28733648fcd7dac5a599613f4c3d2cfa169266dc62b65619b7f28c0e06d32317adb8ec0056ca79c87e9f6 SHA512 3c81dadc9bf74207c4e361605127ef6141d77700c5c54f1f9cd5ad3be13df9f73c6eec2f51d779558e4bdad1e7395c6aa8943a93415bd1786d461042bc03550a +DIST firefox-91esr-patches-01.tar.xz 20768 BLAKE2B 22ebd261b445f1920448d9243e3e15ed2e4d393099552bf43f26c9705dd00f8b87b5720e94fc43a31dd96c3a88398e17da80f81953f0bf9658d75e4a85a31fc9 SHA512 5935545535366abf8681286a9bd745f95f83ebf0d69ba5ce600ae513a4391fc16ea7eb4addbe8ad27f97eae3c1fcb05a78e2fc0fbd4cbf7798a83b778b5e1535 DIST thunderbird-78.13.0-af.xpi 548343 BLAKE2B 06beb7e934e29e09145fce1b30c249d79f6e9f40c8fc309b5033aeae664dcb9dde107f42ae5ac0d2d3e46487be30a22b3541ca87e03f37699bd8d352254e565e SHA512 30f699ccd68cd577b691439a3769ecb6eadda84352cac52d27364527a61d77f9584ce225ab871bf0ca76ece6e65fe939021b09c4adaee8e09f8635d326cb4d96 DIST thunderbird-78.13.0-ar.xpi 648617 BLAKE2B 78542fdc6c1c5f803fff4881cb87911560b8be5e350cb5232b573860af76f689a8e60aea674054bf614ac95d8ca75b8b994b25b7b11689d8f82449f0b124569d SHA512 678c1162243aec8e33a0fe09325f2856dcf2ba447e91a5283aa766c65285e95e7dc66e609a6b5bba9129cac393f09fa7083fb7c39b2d7604216155d9f03c2e56 DIST thunderbird-78.13.0-ast.xpi 561258 BLAKE2B 88ce63137775dc96a410e86323305ee0719d1dde716dc6a74e1314b9502d3d25a0ce92b9bb8194a37ecb06445b063024e3f540e547dd56b660fb732f91505b96 SHA512 84f42514f68228cff173a0fed9b7a54859a716b8bc53ea657241fa9e28f16161230c14c4b32e0c5208386ff47716244837130f2785f7eba3e1845a87b5904dc1 @@ -130,3 +131,67 @@ DIST thunderbird-78.14.0-vi.xpi 674612 BLAKE2B 7c2a212ab5233b307079dbe418f61af45 DIST thunderbird-78.14.0-zh-CN.xpi 687177 BLAKE2B d637b0456f8d90e8e2ff1149ba315a1198512882c15de4010f00b217e0446d3bac533fc9bd8b4ec79167b4de778b5c584818953964f792349a69269237b25efa SHA512 cba980ceba034dff08d0e97902f7ad5dfb4931b269fc16f14cb00ff2bf23391a95086be6b5df9944ba213d18e58071fcfcd4060b5f453a2dd2fe84e8ea9d2899 DIST thunderbird-78.14.0-zh-TW.xpi 687624 BLAKE2B 6466d30812b61fa2d053befc19a4404920bf99c7de6e9d43fa427141327dd9018f4a2fe312834af917f9a6e10cbe68e6b04893fe68fb9277f137525f8807b7d6 SHA512 6b4b37123881c42b0a70727ad73929e026f79214a0b4ef0b9ff2adc45f10c6025379375db60dc3ce56c0f15bc129c1acc2426d90957e5c2dfd6ae0ca249ba526 DIST thunderbird-78.14.0.source.tar.xz 352766276 BLAKE2B e692bfa7c40b05ae691d96efb03e3d6c86fcd1c87ebbf06323d0127d7cef603aad2029b1c76406d2893458b1dc5c0ef7a9b352606c5ab4475e85fe1a75b32311 SHA512 a6b70235eaa5bb334bff02591e030cd19a6c13d0302d12a83966a93c97bbdd6557c78418cd26b486fd1ce7b7c1b84cbc2397cebb29682ad1b45bc8de120cab3e +DIST thunderbird-91.3.0-af.xpi 560018 BLAKE2B 8a29b9a097e2a433cbfd38f680c12cad68cd1479d4863821f0274ec790cb0288e0782162bf29caa76c74c321d7efa36bcba8091a0fddde0a13e44f85325e6a7e SHA512 7f6cefe5d3db2bbf4aa640ab4b68b7b0189d67932821b53eb73a1a2ed274e816e4fce0b6dbf20da4f9ef4d5be8faa58bff40cf9ecdba7322aeb3d22de7c2870c +DIST thunderbird-91.3.0-ar.xpi 65 BLAKE2B adbcd3a7b398e394909c03b8c4e0eca2aec202d4e05c6bdb3a2e14b74e4e82f507727ed40f571b9a03d2fdd27a6124860a9b864674e092798494950023b95823 SHA512 b79d8b4479fd5142a6d3428d501143ffd93706abf73dc26692218e937e207fb0dc488041cd57d8064c2f350de1cac5fc4d806b2a72405fb92b2c519422f12256 +DIST thunderbird-91.3.0-ast.xpi 576812 BLAKE2B 2c8c91bbb902381d6db2a0e165f1e90f4f57944b81c74b3050416c66ade1fb3850e0db9c1dd1e606263056bf30ae6322715a81f6d7e1cb598bf422117a3b03e4 SHA512 fcfa5b390a42b8b6291ca9857d7d739ca008519f5806fa398abe1adb4e56c31138009cfc601ebc059662c94ea0cc901731ec82ea3a635a5ef398b0bf1b70 +DIST thunderbird-91.3.0-be.xpi 685799 BLAKE2B 562e9f085c3494f288146b021f1fb19d8288033b7a4457f4f6ab77e0a44cf674578aea4f68
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/files/icon/, ...
commit: a6f96f350b74a65923ca6239879a5f96e100ef69 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 30 16:53:56 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Sep 30 18:03:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f96f35 mail-client/thunderbird: bump to v78.3.1 Closes: https://bugs.gentoo.org/698986 Closes: https://bugs.gentoo.org/733062 Bug: https://bugs.gentoo.org/745432 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> mail-client/thunderbird/Manifest | 66 ++ .../thunderbird/files/gentoo-default-prefs.js | 7 + .../thunderbird/files/icon/thunderbird-r2.desktop | 30 + .../thunderbird/files/thunderbird-wayland.sh | 7 + mail-client/thunderbird/files/thunderbird-x11.sh | 7 + mail-client/thunderbird/files/thunderbird.sh | 128 +++ mail-client/thunderbird/metadata.xml | 2 + mail-client/thunderbird/thunderbird-78.3.1.ebuild | 990 + 8 files changed, 1237 insertions(+) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 5a073a1bdfc..1f901d9c08f 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,4 +1,5 @@ DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128 +DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78 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.12.0-ar.xpi 617167 BLAKE2B ba476e918fb2a0229ff75eb8daeb7823fe285e79088788fcb0c638c99e55feb79f78a4df0ea2b0dd837be8d12988330fdfc1117dfbdc65e6fb99676b94aae404 SHA512 05169e14a9c8a8bd5e36dd377d4ccc034d3603320298eea5ef2eb329ec3f72595bb6afd57930d3b04c1cfc6b99c122d98a78a9f6a258e6b78c14843e68652adc @@ -62,3 +63,68 @@ DIST thunderbird-68.12.0-vi.xpi 623422 BLAKE2B 4b66830b6c485ce2b8d004741ba9ae2e6 DIST thunderbird-68.12.0-zh-CN.xpi 626820 BLAKE2B 301d3ad3413700879ff1d8f39c471d887ac250f3f1c0f4e47c755d7744aff322d6e71d19e5b6569e839f4e354bf833e6a098b9d22e2039949a391b7234d9 SHA512 88fd1a6a69fbaa3636861cab50b6f2556b8bbc87f303e5e06285ce7cde51701998459fe6e7339578daad4acfba0d994ac7f2202ea266d6987c702a93d0588dce DIST thunderbird-68.12.0-zh-TW.xpi 627476 BLAKE2B d3f0ecd246e9834013494868303287403de78e67c028144f2cb7d4d929745728de5507a40b23dcd1fc04914fff9ff7fabfcbe080ca50768d48d12b61c147034e SHA512 b8104fc5bfdab328e0e9d3ccf373b43fdd15741fec5084da64ff5a8e6221d1b9b383de8ee71a89000e643be3b761921d3490579d6d12c9e88359a32ba8d3a2e6 DIST thunderbird-68.12.0.source.tar.xz 331226160 BLAKE2B 2712dc52cb7ee2b2d75b08907f7dbf945e89f776d12550427134de7f03538f1f4b1c7e747c407becf9be4cd70c9506c5661a9d4fa0e4d19c2499f11384848dc0 SHA512 e7559536a9e024747e3ac7c20e4ffde5adf57657d02109ea32c39bf736ad03707fc7a14a0d3f1c91fa6fd69ead3c38d6c32ce78bd468834d9ba7f77f728332c6 +DIST thunderbird-78.3.1-af.xpi 548782 BLAKE2B 4dc5e65a284fb0ce87a0665040d86961e998340449b1d51125a5b29bc44607524e85e095f001d1b9b7b7c55b6b368022a563c1404ba16e63ab2706b5db442a99 SHA512 2589639eb44d2b33caf89dec6933218aa9959ed4b449be30f6761c2cd894da1909851fb60404c11c2aba45b9a45dd0710ddcb52a813380a012a53e1159be4dc1 +DIST thunderbird-78.3.1-ar.xpi 649063 BLAKE2B df72eaaa069d3740abdce0a360bbc1576500164b898539e37f4ea356414b47e6b150f60f84428b30f072b98115de772162ec1c062eeb904443dcb2db36887f71 SHA512 33a83d85e26a58dabfc93e1af7fece7e4a6eec1f637697be4e0b81cdc379d593f78f70f57178912cbbed7dfa8928b9f177ac54092d85d1ced4317e4827a44938 +DIST thunderbird-78.3.1-ast.xpi 561707 BLAKE2B 13d65d2e543bfc0c123bea1b2699f4fe5ef9fc095db49607096115eab485b8074530c689c2ec88689ae044f16d571416c108eefbc75d9bce37b8940f5e344f73 SHA512 7cf31eaf4333e35872bfb07876540ec2af44a7ac6d82eb34e873d97778cff5914000cc7fe8ed012c88747b539c5d11c65a50fba2cac2587a9dee7d1e49e76cbc +DIST thunderbird-78.3.1-be.xpi 667138 BLAKE2B 4b5acf2045f3a10622de056a5a047994ec0d9897cbb586b
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/, profiles/base/, ...
commit: 907cd15f91a4ef1b6e6f8896a4d4d538a0ff6c26 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Jul 8 16:18:00 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jul 8 16:21:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907cd15f mail-client/thunderbird: security cleanup Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> mail-client/thunderbird/Manifest | 114 --- .../files/thunderbird-gentoo-default-prefs-1.js-1 | 9 - mail-client/thunderbird/metadata.xml | 5 - .../thunderbird/thunderbird-52.9.1-r1.ebuild | 342 - mail-client/thunderbird/thunderbird-68.9.0.ebuild | 778 - profiles/base/package.use.mask | 9 - profiles/package.mask | 1 - 7 files changed, 1258 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 0547634b52c..764bf27cdf4 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,66 +1,6 @@ -DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce DIST firefox-68.0-patches-14.tar.xz 17488 BLAKE2B 697aecf97b04b45ea17ed1c1eaded95ca5064760cd0468968326f1683c10d91b76458c0f3e1ae7772b0d43c33632c03a69e5b09579284de19ecaaf7603dc2412 SHA512 9a601b80f747eb52ce772ec931d4f5ff0180ca1531c92d46ca116fb8218c829b9be496392e785d79106c76abef149e666cdc65204bdf1ebb7904b65264cfa6b6 -DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b 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.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235 -DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727 -DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8 -DIST thunderbird-52.9.1-be.xpi 570931 BLAKE2B f5a58a51bcd00cc256bc7d97813d89c46feef2ffdea07be3f9509b2dd1787fbde81f49d64e1a1c63d2a09d54a07de9fa8f2c958f74609293f61af9fb971c1ff8 SHA512 6ca311620b04a604801771a40a7405aabb2499624dcb3bb10eaa3f0a6dcec1cb8c2db3f9ab51b1f505b164be89bcafaac1dc0cba3f3f8067f48c4dd61852c469 -DIST thunderbird-52.9.1-bg.xpi 634897 BLAKE2B d7faec512952ee336a1ada9552ec76721a89f9ed31a242bcd6a210b38a0c4b664fc212f7236a6e541386f70c3c86b7930fed91ad47c06d6045c8ff07181e2d50 SHA512 0b80aec2e54de435b74e5635ce2bef6f8546118f36346b9a845fdc8cbe653eb99ca8bf10e43facf3bc443de99474f20c39ae3d702e4c3d563a6ecbe2d4131d67 -DIST thunderbird-52.9.1-bn-BD.xpi 676900 BLAKE2B 97ead447ea6dcef7d7f367b56c3246846a8984d51887a4df75d9292cc0b1c86b1eb75e85fa0318c8e5372478f30e8c5ebb1653cc956e68928e3ced9ca0faab11 SHA512 8e560ccb37a55f3b538197a84b38494ea73454ef0fffa41e5c473e0efe4814b41f6d1279e75ca79d5c0370bc5717fffbeb20a544e46a5c42d9b837383c44e23f -DIST thunderbird-52.9.1-br.xpi 559380 BLAKE2B 2dde76cfa4a6f3c133f64fb77b99b10248c00eb4f2faa6ff86965626318c76397d44d81c480230c46a031423cd968da86ce39e1725667818ca0af111f790303d SHA512 a492e7842fb8219fce68727e90b7fb5a94c245186896c519a72e67a5ce4b04b3dd11d1f635c3262978c9ad64be14ae26af7f1c7e8a3295c297eab4c47ebcf73b -DIST thunderbird-52.9.1-ca.xpi 569910 BLAKE2B 3c77e9ea27b9500a07
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: 1ddd3401dfdd33e6867d2a1999b7dcef59d423ce Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 8 12:40:14 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 8 12:40:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddd3401 mail-client/thunderbird: unbreak rust-1.39.0 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> .../files/thunderbird-68.2.2-rust-1.39+.patch | 170 + mail-client/thunderbird/thunderbird-68.2.2.ebuild | 3 +- 2 files changed, 172 insertions(+), 1 deletion(-) 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 000..bfb71cbb788 --- /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":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34f3ae61856f8","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":"1f218e15c19f512908abc8 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":"9cc242d6b3c185594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","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","s
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/, ...
commit: 3def9606b5fa3df1c930dfa93c69396ab4c569a3 Author: Jory Pratt gentoo org> AuthorDate: Sun Sep 1 12:53:53 2019 + Commit: Jory Pratt gentoo org> CommitDate: Sun Sep 1 12:53:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3def9606 mail-client/thunderbird: Version bump 68.0 Package-Manager: Portage-2.3.74, Repoman-2.3.17 Signed-off-by: Jory Pratt gentoo.org> mail-client/thunderbird/Manifest | 55 ++ .../files/disable-auto-update.policy.json | 5 + .../files/icon/thunderbird-unbranded.desktop | 6 +- .../thunderbird/files/icon/thunderbird.desktop | 5 +- .../mozilla-bug1554949-linux-headers-5.2.patch | 46 ++ mail-client/thunderbird/metadata.xml | 24 +- mail-client/thunderbird/thunderbird-68.0-r1.ebuild | 775 + 7 files changed, 904 insertions(+), 12 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 83c69b21b19..ce277b7be75 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,5 +1,6 @@ DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce 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-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b 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 @@ -116,3 +117,57 @@ DIST thunderbird-60.8.0-vi.xpi 637187 BLAKE2B 7ecd85e521b230a2de85382f0ca2588523 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 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: e7c5fd4c33e3407cde26429b3fb5f48503f70f74 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Dec 29 19:15:35 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Dec 29 19:16:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c5fd4c mail-client/thunderbird: drop old Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> mail-client/thunderbird/Manifest | 162 -- .../files/thunderbird-60.0-blessings-TERM.patch| 70 --- .../files/thunderbird-60.0-rust-1.29-comp.patch| 37 -- mail-client/thunderbird/thunderbird-60.3.0.ebuild | 560 .../thunderbird/thunderbird-60.3.2-r1.ebuild | 555 .../thunderbird/thunderbird-60.3.3-r1.ebuild | 561 - 6 files changed, 1945 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index ebabe2c17f1..8099f235159 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -62,168 +62,6 @@ DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23 DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21aac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa -DIST thunderbird-60.3.0-ar.xpi 627180 BLAKE2B f9e41733530ec33359580b67f9a4053378717da58bfd527ed92f802a13dc1d171decae52a9c836b8cfd08d07e056c049b35770d1284b72735b4ac6be71b609b4 SHA512 6932419ec7cb0f8fbccbdda0fe67e9965115f6a4926e195ba3afa3f12335888f2bd48d05513f22a3e8619b854e54d914e4d3a267fc327f85de1b5e707af00c7d -DIST thunderbird-60.3.0-ast.xpi 560865 BLAKE2B 4e42ad1786b3e605aeec6affefa3b89f30a205e8eeb016dbd118985e68961fa9fd34243c0ea1e8984cf3ebeccc1aa24beaf1d0c6dc6a1b1aacab86a650316bb1 SHA512 343d427a37b2d07620f25853c29879542fa8b14d894509fdfefde3367066c9de425d59e8880a27cc1ab602d26b3f2cb70f61cf29afc4756974c630b302e7612c -DIST thunderbird-60.3.0-be.xpi 659078 BLAKE2B 6fe6c79cceaee423acafc1c4ec7990d9c377ce5e1b6e0c52d65ccc289cb05ef5ff25433c17be4b9c92b2f2c97c65379a1254036b18df54957c69818615100d79 SHA512 59f307f3c18a03867dbab677ebf33ec3d1ee6efbf863189faee77eab0f674c4d365b5a59e121c57de748dd245b16d7daa08a30aa7efd03a820e8ee3e07eabda0 -DIST thunderbird-60.3.0-bg.xpi 665511 BLAKE2B 8a0c4f2d44e678c31bcc09b237e69c20e20466565ddecb3c753d9345cebcd8d5ad3be0ce918ab9a1057ed225b95e822711eda4150901c8c9929098a130699415 SHA512 7b7de7e21d8e4b56add402ce3323ed23ee62118f9eb95b7d179007c9c235ee136430163a667dcc7bf0d52da06cafe716aa719aedbcb0a09f19bbce31c7c69d79 -DIST thunderbird-60.3.0-br.xpi 581591 BLAKE2B b7121e8ed5e590094fc60a15ae30d611ed16728e73be02e526410ea602edf05006b5684b4fc7a647b3bc1d9a9ae62f0e68928ae6b5150f51e55b58eb2add34d4 SHA512 7b298b4fecd3d7955e477fa104ffa37b479e594312f4d709f348257abc56e7e34c5e09ab900cfb4873deddeff0005a59be647217203639db675eb1c3e2035a74 -DIST thunderbird-60.3.0-ca.xpi 591970 BLAKE2B 69e1f69ecc20018db8ea373423192e2eaf4a070f77dcb66c0df63f80f4949efe83a2a5c06a65f033f696aa556c87a3d902cde91ae1f4ae8bc64e0459dc7ebeff SHA512 18950a7eeda7043fa75a00b01ba7a311a94990c3e4eb940ddd2543eeaddae69f66909ffbf69a6aa60f07fc194c8f80ed7c275838772dc930c08eb385916e4ca6 -DIST thunderbird-60.3.0-cs.xpi 611201 BLAKE2B f2c051c3e667baf9ee16b1544547910d03031d9a2f4793622edda3557c3316545ba9e99f506af0d557a713781f983bea2fd402a668a9f726320b426f9205b2a7 SHA512 6345b32778357514998da218a6316ef13fd865f5f66d95c6294ff524ff05e527c88d8a9ee57ff30d7aa0fa792f093dd91fea4814e8fdc8c93275f37db97cfab3 -DIST thunderbird-60.3.0-cy.xpi 582232 BLAKE2B 29efad3ac7fe84f9e784bae5fd05b6d98437022b15796d06aa355cb121a7fdbe5f2ed31fd811d11346d7530b8238ef2d20786a7e090b350b7b299e16af997210 SHA512 5d50dd9662d4cd0e19c8217e7dd615b39cbe1ee6b7c7e1f07e62c583f276b93317bef3a02b883bafec5b9f5e469c1afe895b6027c822087727dadeaeb0620c3d -DIST thunderbird-60.3.0-da.xpi 570805 BLAKE2B 020b0de0daf9f3c743cb32a9c0655a8e950a62a114130c988f94fc4a6403bd8e2df0a05be2fbc00377d726e8aff2d332424c18e59dfc31938a675ce18b739ad8 SHA512 8a66cf19804a0fd4631410ddc0014e80fc1a14e071a0b1a9f924f661dedd0d0c29fb5ff920476a5c552f20e7895b43b7b3079905a1eaf037371434be32901301 -
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: 9159b311064b20d1b0b3f8aa5723b9a8d7506cd8 Author: Ian Stakenvicius gentoo org> AuthorDate: Mon Dec 3 20:12:33 2018 + Commit: Ian Stakenvicius gentoo org> CommitDate: Mon Dec 3 20:13:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9159b311 mail-client/thunderbird: drop 60.3.2 Cleaned up the sqlite3 patch for upstream and removed old patch and v60.3.2 ebuild in favour of -r1 Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 .../thunderbird/files/sqlite3-fts3-tokenizer.patch | 87 .../thunderbird-60-sqlite3-fts3-tokenizer.patch| 53 +- mail-client/thunderbird/thunderbird-60.3.2.ebuild | 562 - 3 files changed, 33 insertions(+), 669 deletions(-) diff --git a/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch deleted file mode 100644 index 4e45b139268..000 --- a/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch +++ /dev/null @@ -1,87 +0,0 @@ -# HG changeset patch -# User Arfrever Frehtes Taifersar Arahesis -# Date 1543532530 0 -# Thu Nov 29 23:02:10 2018 + -# Node ID 1c480085935783bd1d240860bb44f410e2d36322 -# Parent 645332be364fb8ce3fd29b6cbcd480e5f2e3 -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). - -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 + -+++ b/db/sqlite3/src/moz.build Thu Nov 29 23:02:10 2018 + -@@ -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/storage/mozStorageConnection.cpp Thu Nov 29 19:08:28 2018 + -+++ b/storage/mozStorageConnection.cpp Thu Nov 29 23:02:10 2018 + -@@ -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.build2018-11-14 10:14:14.0 -0500 -+++ b/storage/moz.build2018-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'] = 5 - - # 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-sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch index 2909c6cf476..48ebbf154a3 100644 --- a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch +++ b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch @@ -11,10 +11,11 @@ tokenizers enabled by default. This allows to use system SQLite in distributions which provide SQLite config
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: 0e8391d08065f1e1006660fd8289db6cfbf5a974 Author: Ian Stakenvicius gentoo org> AuthorDate: Fri Nov 30 21:09:03 2018 + Commit: Ian Stakenvicius gentoo org> CommitDate: Fri Nov 30 21:11:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8391d0 mail-client/thunderbird: bump to 60.3.2 This bump re-enables Global Search when system-sqlite is used. Bug: https://bugs.gentoo.org/583156 Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 mail-client/thunderbird/Manifest | 108 ++--- .../thunderbird/files/sqlite3-fts3-tokenizer.patch | 87 + ...ird-60.3.1.ebuild => thunderbird-60.3.2.ebuild} | 10 +- 3 files changed, 147 insertions(+), 58 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 85ea2967f23..49fca0ef03d 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -116,57 +116,57 @@ DIST thunderbird-60.3.0-vi.xpi 638421 BLAKE2B aad9f330e7f95ba7204775710162f40418 DIST thunderbird-60.3.0-zh-CN.xpi 622465 BLAKE2B c374b6a7d8e6a10f6340e814f62843160991db3a8e820c0acc9294d5e3416cf6025a9c472e21802095c7a88408449f111a9d0d3d95efee33b2903132847daa82 SHA512 7da02ae8830126da7646c4379ecac20123a7f9f2f9c0e72581800a5673332c8664eda1d8b2bf906fa452bee8a10413191272caf17ac6d07a2f1fd8bb5502ff3a DIST thunderbird-60.3.0-zh-TW.xpi 626188 BLAKE2B 462a59258946095a905ea455267cc50893b8dd49d04d0adb02060945a660c80dea2bba5d9de5a9f4381b0c198211711f821c665fd33d0bb2b198afc2e7dc38af SHA512 337aa9e5dcb9aef0cdb44d9d24c9eafb89b2e3bd13881b445ab5a49e4adfc47136b7180009998fbc61a7e8140683fa0bff571bf6970f944d841e6fca1aa1bbaf DIST thunderbird-60.3.0.source.tar.xz 285211708 BLAKE2B cb17d27ac97267507353d1a0cb501a9f9a44a4bad6389dbc2ed95f3f23626540075325d6787c992e37bbab7096d2553618a7e5888614ebe1218d7088b0d78127 SHA512 6cc390129dd2ce30c4685748bc5cdbf07c1326bf1ba4727d34b105f800ee3d0c7344a1bda3b8f6a666f635eb6d2fba7da5afb1222aac05a536d2dd77afb3a8d3 -DIST thunderbird-60.3.1-ar.xpi 627180 BLAKE2B 6fab74803d4583529d5f4ff48e0081c4d62c635a0a990e0869e3cc3d34189dc84c986cdba5f978eaf992c1c75e21cdc40fcecfd665e74382574f80a38a4b7b63 SHA512 c13719e8c97dacd35c1f8cc7ecb73de162eb1a17d5c3bae7e501f3675554bbbe0a6a08858445ad355d3ce6522997531092d5e516c971e6db366d2d00ae9d1906 -DIST thunderbird-60.3.1-ast.xpi 560866 BLAKE2B e02a1a4c4e138e6cbc31e7bc2af01404b3bd8411f1325cce30ec5bec1f6194a9a5493227049f9e7f12b33e9acf014c6ab076c8d55dcf332215b4cf05576a0497 SHA512 6502fb9e321420bc72d77fda5724e923b4dba80d4522c45985f4447f67862e991429c9c8e47b38e997cd7a729504d40c2eb5d3d50bca07d833c75e80103ee090 -DIST thunderbird-60.3.1-be.xpi 659078 BLAKE2B 237ce951c43210f3f5e6296c7081d5e188008ffe516fcd3227752c8607f8e2b35ddf0d9e05ded0e9dd88ba6f5fda88ab16068529c1bde352266132a079568968 SHA512 e204a26bc828e4ee460e39cd48ec815db127436c640457cdeae870856e417937f5bb2007a4cc7eb9e7092c5d1f43d9551105eae28d539dcadb16ba089cd614c3 -DIST thunderbird-60.3.1-bg.xpi 665512 BLAKE2B 8af83075354f635f88e2dfd716b1e954f4a89ba4afefc39d570725fee18a9e401cfe130dfed465209f7a464a5e9f8b77764d6ffa6084ce3551f236ded837045f SHA512 2a906ab28ef4e24a9a64f7a58f290178d89fc203dd213ea5a3fcaab90b6e5c30c5af063c9e7cfcf040f56c29ddb5f4bf9c35d4d8d92d1e3af69dc83c8a8b0d29 -DIST thunderbird-60.3.1-br.xpi 581592 BLAKE2B 6213d07f3233a36f2b800592e495e314e894bbe38ee9af77ebaef196e9f5337906eb8cce91f322e15c2614d98edc3dced567ac21dfedb1de816bddcca8041a01 SHA512 f65729612c4367d5c0590dd32ff0bd674ab1bf9edaaf771bd7900d322fd613f297b35332bba8fd3c95b54692ec8d55972fa68f6e97f04363214d2a701f14a4f1 -DIST thunderbird-60.3.1-ca.xpi 591970 BLAKE2B e878cd92493bf382d2965f75d4d807b18f16da41d798f2bcbe6ffda49ad530a393f6e53b0b8ba948a23d5b118839249164213efb305c456bab7d212c9b0ffb49 SHA512 f68717f14b2767fdd302bbe2fff2a17d3d0ea23068b983a9d6052ef1dfe7c6169643bca1356eb9574c0eec7f6a34caee8666e588b1a966f91e26dfb24782549d -DIST thunderbird-60.3.1-cs.xpi 611200 BLAKE2B 8e48fdae401e22699c0aa869dfa00dceb38c1422c74293b4ebdb0e27efd4e8b9105073bd698a5e59b2aed2e0db9670a2b3b00fe2ed29474efa5093a941ebbb22 SHA512 c6aec1177a6a772b4d43c15df5ed0b2504c639cd5c66166af372d1d64b1936dc7e174f800dc28a6ad402e409e03e878354e63accd1b8732b8d25e394ffc7f814 -DIST thunderbird-60.3.1-cy.xpi 582231 BLAKE2B 42ebe86e238029fdbfadc0a0c22acba9e7ca78bba230391f6ef739c0d880e939dc7380400ccdc30cb7695e6a7f3a00b73b6d5b56f9defc7b7d7382ac89a93292 SHA512 58a6431d2b160645021e06094cadb8ae26bddc306c0848acde6a7031bc085bb6b3f17d4091d4dad4f5cf40ea61179a331949550ab8747650cd2f20e1207050b7 -DIST thunderbird-60.3.1-da.xpi 570806 BLAKE2B 182a8f382af27959df69fece2349d41171510097c64603bc2acef5e568747de5cc61604b7b08304854147f3a8ab6d1e4f54781c27b1d0edf8c0d9ba3f2d9d606 SHA512 1879d76a7945cd92172e798913dd05960a3b14994776b004e6c517b3af4b6bfcf0af0808a381b0e9dc159ad15c25f423df3fa8fc32f1c334aaf57b351590e56c -DIST thunderbird-60.3.1-de.xpi 582574 BLAKE2B ccbe51866ce8c9b1423ad0d1334e5d76e571f1c327c646e
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: aed9654bcc37a01ee11b70fb601bfe8b68ee8dd3 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Oct 12 14:50:34 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Oct 13 20:53:23 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed9654b mail-client/thunderbird: fix link issue with ld.gold from binutils-2.26.1 Bug: http://bugs.gentoo.org/593958 Package-Manager: portage-2.3.0 mail-client/thunderbird/Manifest | 2 +- .../thunderbird/files/firefox-45-gcc6.patch| 40 -- mail-client/thunderbird/thunderbird-45.4.0.ebuild | 5 ++- 3 files changed, 3 insertions(+), 44 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index aa973df..824031e 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -6,7 +6,7 @@ DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 615b47ed076ead8f6fe8a9cc8b51ae7 DIST firefox-31.0-patches-0.3.tar.xz 6004 SHA256 1ca282d9b58e611c395fcda508bf0ddfebfc91ea6a6132b59f1acf90566f663c SHA512 4469ccc3200955bb790a177352ebdbfa5c2299581bbbd0d83be4e2e0ccd5cb850c5023f3784dfbb3cd5d0dbed9bea4b533bdbe1627e42ba60437b4743a0e8fae WHIRLPOOL 86b2da659dcb11f34cbb6bc966d7f7ab79fb3f8f3584f929ea50f7893bf84b01ece435c4598c05b538d0719fb0426fca51a1cc9f9abdecd8b8e8beb5109cc899 DIST firefox-38.0-patches-05.tar.xz 18412 SHA256 d2a2be8359c15d42fd2355bb54048db88af2288f9f9b69acbd742c29bd10be16 SHA512 0556531fa5685bf04438df22b0e35ffd22c27e31a2d1d264b9401af8f3c79604577fc71f71e2bf338dc5465471152067ce1a30ba2813c612e062e20c4b5b7ea2 WHIRLPOOL cc9aa2174395c8a70a9fc7010fc48d2f4e35c64c73deda38934a42ded5def14f7ccf6c3be8700ab3bea02bdd93bb4b98b40ff44176e4cfccd0b68b70d9deed61 DIST firefox-45.0-patches-04.tar.xz 18600 SHA256 2ee0ab58e0a1db7b573dd7ac407dcb9a43a85dd295c5d6d263f72ce629c5290c SHA512 cf5d4ddfe14dff92950baae066350ace0a503c5bdd9d837e4724fd2fb905a2fb540dcf34971531e79547dd62dfbf217d472f39ccc4802f34a245e24f406fdb5e WHIRLPOOL 1461c61ba7e54b7a91c758fdf91fda22260eaff4148b3cccab8ccfd9d09a3d80c0314e999284d392d9e961c42cd9720d6d30ac190074f74d1e53ecb1afa1b1e3 -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-1.0.3.tar.xz 55860 SHA256 2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb WHIRLPOOL 2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d54c9f6b469c95ddb190fa04fe14a54a WHIRLPOOL df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092 DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1 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.. --- 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.h2016-08-31 12:38:43.094770023 -0400 -+++ b/config/gcc-stl-wrapper.template.h2016-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 ; break the cycle by always explicitly - // including here. NB: this is a tad sn
[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/
commit: 04f5cf514ebb6d4cc2b0f4f10311fcc12d9b0abc Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Oct 4 20:48:20 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Oct 4 20:58:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f5cf51 mail-client/thunderbird: version bump to 45.4.0 Contains experimenta patch to fix build errors for gcc-6 Package-Manager: portage-2.2.28 mail-client/thunderbird/Manifest | 58 +++ .../thunderbird/files/firefox-45-gcc6.patch| 40 +++ mail-client/thunderbird/thunderbird-45.4.0.ebuild | 392 + 3 files changed, 490 insertions(+) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 4d09f06..f8a67b5 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -17,6 +17,7 @@ DIST lightning-4.0.8.tar.xz 2307984 SHA256 7a0e2550edf3d5a6d8e2566dc20f20630c8cd DIST lightning-4.7.2.tar.xz 1927008 SHA256 55a2c26941834600364aec143797662e92a6a8203c4f5f2b315830755d80 SHA512 878fa278b8f8a6b7733e81aed0864104ef3c60d0236b729c71cc5e4e453b97255c3e4e4140c053e1ceb586142c46ee57b21539e23256a0bf78b6b8628405de88 WHIRLPOOL 53979b914e944f9026ae9d93b9ced6e69d9872ed4f7f385037fbc5314ad496deb489bc1d6435cf27aa74d9db4f615fe17a06ba022daa496f4d2de30aa2bfb48f DIST lightning-4.7.3.repack.tar.xz 1927348 SHA256 1602f5f7d0e51161ca2057ad3b7f77c976c5d6c9ef6a852afa607fc32fd9af61 SHA512 19b66daeba7686ba59942e582ba5ae5feb8215ea97f1580cf42347b3ebcc4947775e40975b728091d0515051e5fcee01d73b29f78dc243c17dd1f0077f0d1627 WHIRLPOOL 0da115a00ad2be42999d316663ac45369d3157c344127e7b14f66b42354363b890a5087d01d44de5b87bd9499d7e20060da1d3e7e9d64629fae17ae0698bb9d1 DIST lightning-4.7.3.tar.xz 1134460 SHA256 8834c59a58797af747805f9a67ebcc311607a98bea4d185689d7c35f024bce7b SHA512 ebca7d74413a15f404ce094e5a4d047d79f250a04c6c1e78a3ab5aa49946e1e1ac81a1f7703bf2e631d841b98df66a21982788ee15af14eefe1d51eca29e1d48 WHIRLPOOL 34a28dcf707fe564433a663c2ac3efc79dff409cf22383425f38d4ac06184ac980f35a6ee81ab8e9d7030189538188ffe2d5fa426e0aa1cb8a11ebe6191a5fd1 +DIST lightning-4.7.4.tar.xz 1927800 SHA256 24310e7ef2e5dfdf35c52cce4480553c1641368558f1c388e8ba3a99d4c8f2f2 SHA512 65b398d71897a942cae30924de15ae47e2fed83cb70a58b3d99271246eaaabf48703a1b8b5ea74799bf66a4908df56ae2fa75422f62979036f1d322fe77fdae1 WHIRLPOOL 499deb17bf2cb28b028dd68f41c973185282703dc87963ae5df60d81f8e8004feda9a9e5ec202f94ddf87249402e78679330ddd74e51347a12702d005d2ddf38 DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffe210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f DIST thunderbird-24.8.0-ar.xpi 457862 SHA256 e954ec8c64356b82006b01f3bb30d247994ce81f37a7e96de93c606b464c55cc SHA512 f8267f4ef885d900e15bc8609503ea6da37dde39b17362b0e35d384ec51416847c4c898a638708dcbc792bfb1a819bacc1b1f9f8bbff45623ea521c902929cce WHIRLPOOL 8116a679e37eae740e880fcadb48ade6d49cb96732a4f4212038f1ed03c15288219fc7be9a308709a658882872dc79aa794907643df7ab2c139358192635eb98 DIST thunderbird-24.8.0-ast.xpi 373831 SHA256 acdfeef9612eb4ec261ffadb8f5ea494aef4200f9758df55365646a99a6bd47c SHA512 5968a948bfc69f82982890ac3414fe6d9c8c587fe9b815dd29ab3d4a01b27e67d99270d5f915f5c86edab430fa3c4e57ee2dae73be1d32bc06088831180d2e14 WHIRLPOOL b3edbf4b1f70df7d8d08e24f801b82961174b5e78b0d8977b0a070c18a4dae0871063e0f177f2388b8dad1589a2e33d0f87a876dc63bd3f558cf645dd3d46718 @@ -301,3 +302,60 @@ DIST thunderbird-45.3.0-vi.xpi 540497 SHA256 36325c156df4a34a581fe8fc0e5c013364f DIST thunderbird-45.3.0-zh-CN.xpi 489209 SHA256 cf53c911e587360f7acf1756dc714d975b3691b3521f49d409b6a5f5b3b1b016 SHA512 2869f3cf67e02de76079361d66f91d4a21d183f2ef050d39d6f8582bf66de8b027fe627d9a596fb7b6351e1195a1fc0daba71a683d94ff4000ef9ee20b3f6d87 WHIRLPOOL 2bf513fe2f4049bebead2ce7d037667f9fd1c271d15fdc6d83eb890cfa728e1b6790e7e5b2e743b4beb8d0cfe53371453417b947edab9132a49de24fb2c4decb DIST thunderbird-45.3.0-zh-TW.xpi 490850 SHA256 0c2d483534b394fd27cf934e80537d0c789023b4f67eef87965679278d6a6e7c SHA512 180086ec0baa27595906f66c8c9ccd017e5578dd1ff8875f1e8a7ee3c83867950ce9309e3608ae382c84b02e80383bae6a6e21140de4aa90258e4d87672e8643 WHIRLPOOL 5382beeef82b920959eb37a21eca3af96a6dfb6078fafe7a6487c149f059e6c464e4a113c848c341788119e6644834027137eec5210ef0021fd7f1635066f8dd DIST thunderbird-45.3.0.source.tar.xz 201005896 SHA256 231f6a7a073344659e436a2b1ae58004c3a29e74375af2c8d0de13f3bc79fac7 SHA512 1226b35535d68b9c088ab8692f61120c99951e1ecbae4739ced711665a3237d248202831831f00536c724e2f6359db4601fa5c90f2793433eab4bd9dab0c1165 WHIRLPOOL 86c4145859ee39d4fcf48eacd5a0b61f6f9f70fee3c2e38fe5b225c06e17ea4b7c1c5ccfa2c9f4d0696e9d807a6b612990ccda7d35bd22a8687ef15a9c3747be +D