Re: [PR PATCH] [Updated] [WIP] Thunderbird 68.2.0

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is an updated pull request by Hoshpak against master on the void-packages repository

https://github.com/Hoshpak/void-packages thunderbird-68.2
https://github.com/void-linux/void-packages/pull/15785

[WIP] Thunderbird 68.2.0
None

A patch file from https://github.com/void-linux/void-packages/pull/15785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thunderbird-68.2-15785.patch --]
[-- Type: text/x-diff, Size: 6238 bytes --]

From be7f2e962afcb1c0ecbeb5137156977eb4f9d1dc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
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 <simon.sapin@exyr.org>
-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 <gottox@voidlinux.org>"
 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 44eae6cf878bf9afcb8daf7e95983483bc587e8c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 75f5a6808f8..79eeac122b8 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 <gottox@voidlinux.org>"