From be7f2e962afcb1c0ecbeb5137156977eb4f9d1dc Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 25 Oct 2019 10:07:48 +0200 Subject: [PATCH 1/2] thunderbird: update to 68.2.0. --- .../thunderbird/patches/rust-cssparser.patch | 90 ------------------- srcpkgs/thunderbird/template | 6 +- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 srcpkgs/thunderbird/patches/rust-cssparser.patch diff --git a/srcpkgs/thunderbird/patches/rust-cssparser.patch b/srcpkgs/thunderbird/patches/rust-cssparser.patch deleted file mode 100644 index 1ebef87c014..00000000000 --- a/srcpkgs/thunderbird/patches/rust-cssparser.patch +++ /dev/null @@ -1,90 +0,0 @@ -backport of: - -From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001 -From: Simon Sapin -Date: Tue, 23 Apr 2019 13:47:25 +0200 -Subject: [PATCH] Fix a future-compat warning - -``` -warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed - --> src/parser.rs:591:17 - | -566 | pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> { - | - let's call the lifetime of this reference `'1` -... -579 | Some(ref cached_token) - | ---------------- borrow of `self.input.cached_token` occurs here -... -591 | self.input.cached_token = Some(CachedToken { - | ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here -... -603 | Ok(token) - | --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1` - | - = warning: this error has been downgraded to a warning for backwards compatibility with previous releases - = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future -``` ---- - src/parser.rs | 50 +++++++++++++++++++++++++++----------------------- - 1 file changed, 27 insertions(+), 23 deletions(-) - -diff --git a/src/parser.rs b/src/parser.rs -index 51f441e4..7cef117c 100644 ---- third_party/rust/cssparser/src/parser.rs -+++ third_party/rust/cssparser/src/parser.rs -@@ -555,28 +555,34 @@ - } - - let token_start_position = self.input.tokenizer.position(); -- let token; -- match self.input.cached_token { -- Some(ref cached_token) -- if cached_token.start_position == token_start_position => { -- self.input.tokenizer.reset(&cached_token.end_state); -- match cached_token.token { -- Token::Function(ref name) => self.input.tokenizer.see_function(name), -- _ => {} -- } -- token = &cached_token.token -+ let using_cached_token = self -+ .input -+ .cached_token -+ .as_ref() -+ .map_or(false, |cached_token| { -+ cached_token.start_position == token_start_position -+ }); -+ let token = if using_cached_token { -+ let cached_token = self.input.cached_token.as_ref().unwrap(); -+ self.input.tokenizer.reset(&cached_token.end_state); -+ match cached_token.token { -+ Token::Function(ref name) => self.input.tokenizer.see_function(name), -+ _ => {} - } -- _ => { -- let new_token = self.input.tokenizer.next() -- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; -- self.input.cached_token = Some(CachedToken { -- token: new_token, -- start_position: token_start_position, -- end_state: self.input.tokenizer.state(), -- }); -- token = self.input.cached_token_ref() -- } -- } -+ &cached_token.token -+ } else { -+ let new_token = self -+ .input -+ .tokenizer -+ .next() -+ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; -+ self.input.cached_token = Some(CachedToken { -+ token: new_token, -+ start_position: token_start_position, -+ end_state: self.input.tokenizer.state(), -+ }); -+ self.input.cached_token_ref() -+ }; - - if let Some(block_type) = BlockType::opening(token) { - self.at_start_of = Some(block_type); diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index a8818b013f1..00ac7345e35 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,15 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=68.1.0 -revision=2 +version=68.2.0 +revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" maintainer="Enno Boland " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=de0e5c7d1d5576f451e386e4779f155b7af97621a4e22caac0c6dee3c9d76eef +checksum=e9fa1d0ced64ffc32faab9a0fc8e03865c04e4d29bfd7a3f1bf5d25594ce0600 lib32disabled=yes From 72efaf811d8b2496cfb8609cc03a730f7bfd7ae5 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 25 Oct 2019 10:08:17 +0200 Subject: [PATCH 2/2] thunderbird-i18n: update to 68.2.0. [skip ci] --- srcpkgs/thunderbird-i18n/template | 114 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 75f5a6808f8..2b1e8034577 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,7 +1,7 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=68.1.0 -revision=2 +version=68.2.0 +revision=1 build_style=meta short_desc="Thunderbird language packs" maintainer="Enno Boland " @@ -96,58 +96,58 @@ _pkgtmpl() { } } -checksum="299c3cd104a772caddb3f9846d9f5a9ed4fe458107d20fbc572c6f64ff8dd803 - 4b2fd0ccedaa53d563109c49285ab94fb3253574bac47e9f15e08f9292822f0b - c9c3ef83e168053ea643634bb68be3bf535f5fa034baf510037b039caae2be3b - 0ab37e7610d867ccee8cbd60225e3411a1903bb66cf122ea0a76b8a3143240d6 - 2ed1f39b05d7c796e72991b295dd7ed0a379a82d9e04eb71a02988d31bb50c9c - 5b8f52004ebb534bf56b7f50a777cfd75b9a9afe1e56599d140bacb6070a9e2d - 8fe713b8e40ef6dbcaf0c9b25a746c6357ca9f8199b4f260d70fa52df32b2e8f - 1de5dcb10200cc0f4c18460818e8f4eaa7d6935798823ac7b940bdb23bd71105 - 507a951afd321672aa3afdf3929dcdd115a0467b6c9a44fbd1a8f0da6834766c - 96acf1fb337ecc7cedbed1f5645174ec097b13d4f991626ac82aea1dfd51263e - 90e33e95e38df7f5062dcc75651b32ac2b8a33c52488ea4d14f6aa599ab0c326 - d5d722c13d330a4a7cbff2194a0dcee38adc4a9c991b190cfa6fd34d6386e204 - ebd469af94e084b5444e199a9fb0d9d78b9883f7344f17e3d40d4accb408937a - c5a620c0bedda19473f016f974d5c0f2d3059dcb50378c4508499d291939ed03 - 5080942902184e756853be14d638230e303cf759a9d2624675aeb10bdec6af63 - c8cd9bb150d378a4b31fb39e7c599ed2846f236bc3e9055096fd6dbe47884e3b - 9b3d4eee8044dd8aa700d4516624abeccf5a07df6eea85c8c190a3f1d8c7dc38 - b6b890964b13a96db89ef0df67875c57f312128fd65c3d2bf74fde69b7e50538 - 4f1583824df5c2cf1226b0ac4e273a84527c2918cc7693764ed9ca29d70c2ec1 - b2232b56e8fb57e6b7afb5fe2fc3d0b0310b859c57007757f8728a265aea2168 - 3b33c15a67f085ea3ba09592aa6838d7fc92c15d896970ce6c14f00b995c9fb3 - 1ef54e007d31be97a4cbae13502102fbe4a96c5aa10f88cf5d8668d81002ea96 - d8343c9929471be60a630c02813f22dfda92053ebd7e015293c074416e9303a1 - 7648f75c750bc2217dbbe2cedffecd8adac822e5ff47c8ba90852f710da50fb6 - 68b87c15541da22030209a9e778a3f6630a28585a676eb66c83c27438bf0b502 - 43883f25a5900491b9cc580d3a915ae9a2f0e079365ca7ce270d896e80c89516 - 941bf45eabf44913061df016c4075f83774bea40fb8eac30d0694857b4b794fa - b1fba58a22c5f5ee287bd6ca318e86af92f1fc36dce450ffb8d762a2acb5d4fb - 5e2b2d25586bde17f91674f9f06bd32cc8e49d3e3f20666d5592f33de67c9ef5 - 1d6213971b700be7de8e074e2b5a78dc89bc75cdbcd3020b9c36d423d01fbfac - fbc4a8a47adcc79394e12108c5187e274cafb5857f36843a40bb4dfecba3fd13 - 4701efa9204bccb8e37f0be35487908ce21b3bc7a654a230b5c925ff778a815a - 3609d9cadfbf377ae5bc115c5badbad6000352c800272bba75663b9eb51dd7ca - a54b54f2e07e9127a0cb73bfd6cf19d766603be12ba9b4e159cc848a70fa93cb - 923ef8755962cbe7871636d5dae60a4821ff9dd6a61cb5c610fe5290511cccee - baf929ad8c96da4f90920d3a00e585da7e400fef9a48dab283ee1c27eca86914 - c5af8270516f87b7ba3b48914bed4d55a7d2dbb27d847c6d408c9e71e4065fbd - 7128daa26fc5eab437a4a71ee76f4678376c4fee1d43eda1fb5d081e1f213a55 - 949646dba79b8caca43953360887cf1eec4b71c2fa695f4842c6e7fd5503cec6 - 30f621990e2f54c4c9e9a57e1efe2603088158593d6315bf8d333faa8c774680 - cacbea21c271f54657fdf12ee50e6b4e9e1c6cbd99f4848609b888748a85e4ae - dddccfe6dc39514598b59186fd26e59287cfce4e16e23e68d7f3a0eac2a78b1c - 24c14480fd5fd93c8f327464ef77e619e043bbe0af682ad8791039b2f54cf693 - 6c97b56c97a0e51dfd5ba11f2a4c6988580f172217d70ea99d7b0f1cfa01d6b4 - d5f294c8e7b0471be3cc501e419aaa62e5948c8d5b916bfd6d13ffd82b794610 - 0bfab08dca7ca8d32f36c8daf02c9bab7d88f44a87027339e2418f2a6dcdf134 - dd3e7ae3b7f6fe0de56e2cbc67d4fa65d4d5816aad93508afa60ff8c62246823 - abd21a9560b8be091e1961a4f350d161f2fabfdaa05ae86cbc0334feb20bdee6 - 95ba0af507f9f665631845a76a2a494d25442c939f4e5db9dd96f1bf0938aae9 - 9a8fb53132614122c7cffa6a642bdce84d02c78205656c2382c49bf4aa5dc2b7 - 26901add0592a4b29cc54940b73dde0b3e3231af3d4d0c34be056f12c1aa950f - 64ab10bf053df33d19f6145a51edc22643d95f6e0a4e3a4049dd2a14bef32317 - 534af1dd87667c451f55b00f9dd2f8192160d3902f8976666b3be85c4fe0f353 - bad55df7f823c15ccb492a4468dc3507194ccd1900c9771139509cc17dc7742a - 47aee2cf1c4a55e432ddf7ef99099e1ef5a77d6fffe0945cc889b583048b2432" +checksum="f2c860b9b51e82cca88dceee0e1984304857ea1b02f33aeac81d48fe2b64b5f7 + eb53683d0282046fef5b51b6bc6bdf7a81b7f7cf08780ca1201d5c955df9bdc4 + 54b8e3363049901f30f6e1eae5ea91b412a534ad2307d5593c18a104af52ec65 + 4fdbaa5a55531ce7c14f9f3a70b9c0dbdb5899e69828b0f52167250907337cbe + b87437d737c08da85f99fcd5c275146b5c117d610abb3f9cd2165097e7796270 + 72970568502fd3705cad564352d379b106fe200b6210e4b9fba316380640b594 + 801b58ff79418dc631dd90adec449ec6d4d2ade8389bdb5061aaaba67b2c1252 + 1b6a4c5caba5c045d8a39eeaac8b283d10f61d90ac430c22550d6df925057902 + 35b8be32e45ccb273b230784b9770c33a275809c3a2486cfbf3f4dff1e47be7f + 96962299531f96187ad8f19beaaccb269d400866b6e1bd68d4be49b003c0573e + 1cb85cbfcc5cfc60d02a933ffc8965e22d72dbf1bd753a4dd579c73750ccb089 + 5d5f1d648d506c2949608b61a4e0ceabb147ee67ec044d4fa0928342fcb72b07 + e8e6f13c63519b936b0c9dab601113927d088e355f56dc1ecee8a67672479868 + 801db299ee23e072b67f9a32f31ef9698b00c6606383bbe68f8bd80b5c1a4a17 + fb45e8564dd3dec63ec4f40130cf3f17c93d8984763eb3f597004e2ca285afc1 + 52863f6d1084e949ca7dc049ed0262ec30a727b44ad0c1013befa455e6f62aef + 07e0aae3b9b03690e3043d1c7b934fa94f54448faec27a501e2be5c7a61b45fa + cb307807a3a8c7e547699686e10b7241732f2e2f0e2b4444f52571160d2416f5 + 4e0fc89aee578d1a185616dae1724ba4420b427fd808543272f832fd2093dd0d + 70cf205d1d8608dfda4c06d41e4987b826c5f78b4f322653c1f5f89f8938fdf3 + df30d4c30c8c24c77d7a460b39e270229688f1d8a0934403a477eddccea586bd + 42cf6779a821385b86bf98dd92449acf50ec65c9d30a3f1b2b8c7595940cc219 + 17765fb2372e49a358357f8f929400941eedcef8b9e1fbafece691abaa1baeb9 + 602e82a93d8f9693ec673bce62669307842a76016ba606b7f889f918017edb4a + c1c0c7a406705abaaeeac4ce4067491834e129d176b882fb81be9ac81e4cfed9 + a757fae72b5d74f26fdd93d7f2127063114577a531bf1abc30ff551b21516d07 + 76f993d26daf1ab78c9e400534fdd4d43a872072d1a996128379564ccbc05565 + ca373702339a4ce6332ea9b3243db9e22ac3b3ba9b8c07e08fc74434bbd166ae + eb252d72c459e022e71814bfe9f9791a18c05b7af9c0ae38b88278bbd3208ab3 + 2fceb4ab866ae333fd51af915026ca757b05244a6dfd7ec963aed034c4ebfdee + 64f3d439156e4548bf7b25554c136f252c354e0ff0aee9e0120fcde4dacad72c + 768f466c9051680756cdf565b0e38d78e53b461bc6dcda87688dfee25f59ed95 + 517dc49487b53c0109290028d8d5b4d4d28fa26d8fa5b560cfc543e63ef4e790 + 308ef1e8843ee417264bf1609e36b499f1d2dc492e895a517f954baa08369215 + 3372b9610098a6d078fd12ff120ad6a42bb2f9b4cee2c293b65a4e30a61424c7 + 569cf516af31f4ba758b1c642fd8a1542865402401bc100037b67794685c44de + 9b34e10decb358986b8feb25c744bcb93bb63f161a9ba57ed96b8f59aceedc48 + a8dc7f2f116f854def26c8500932ad562a03f07d989920beb708955438098fb1 + b40a7ba2a6e4ae7b384ec0def499491f36b9aec8ea447b0ca8f4803c26101b62 + c4e7529061d566a6459db393c631611082a313927496f6ae2e2c0ad9c8446b29 + 1ee3d88235e82b79a7f0faae5bd3075897d5ba6e3637b24dd40dedc6a4f2af9e + 8840239f8fed40914ef13528af1a065165fcbde742833874cfcf809efc49ee69 + 35eb2e687bdda87a4fc68fbfb2912c946b14df96bff8e2be91317f8a516b74e3 + 8cbb8d3f110b51ca6df33b0325ad55eb3a51ba776dee1b9fd05e686bd59bd69a + 7b98bbe91c7cda9f303f763ccf8ea1ccf5dad609cbac3c1c05881de90d04f79a + 12edadbfc1bd07077f831e69292193f71d544d75a76920ec8f3eb90962e67fd1 + e115c5945c792663c4ed763b8d96839e2f04e00529bc515e96db5be13556b4b8 + ccc0339e0dc7a632fcd177ed3c72282deaea9eb054006109fd8947b52d4eace0 + 259760d020ec23dd3f2378f5321bf3e24fbf52dc512f28f758b0b496df235f13 + 7094c71cc361fa475a049ea6389ce7bae2e0cfdb6462cc5c80747e5b966c60cd + 39b47b02af5e8425aad3387b51e5607a0da9f656923af5b607ec3eb20cb957dd + 106789a376cf45138bdc0df05003110dc1d6527a6e3dea03e8e1de3b09f08505 + 15df8263a1f1185137a9214ddba2a82ad302205dfac3303e9e32d9f9ce9aaba5 + a358a64a4a2ed11fb49946a33bd8d331a438a815301a7a79368b10f063d3574e + 06a1e9f74f6bf3b807e8726138890bf1664886c8e2abe2f5b303e068141f7f4c"