thunderbird: Upgrade to 68.1.2

Local changes
=============

Cherry-pick a pending patch to fix build with the recent rust version (1.38.0).

esr68 branch fails to build with rust 1.38
https://bugzilla.mozilla.org/show_bug.cgi?id=1585099

Cherry-pick patch from:
https://marc.info/?l=openbsd-ports&m=156984549605237&w=2

Upstream changelog
==================

What's New

    fixed Visual glitches: Missing context menu in filter, downloads, password manager and Config Editor search boxes, unwanted scrollbars and cut-off text in Account Manager, incorrect colors in Calendar agenda scrollbars, theme issues on Windows 7
    fixed Some attachments couldn't be opened in messages originating from MS Outlook 2016
    fixed Address book import form CSV
    fixed Performance problem in message body search
    fixed Ctrl+Enter to send a message would open an attachment if the attachment pane had focus
    fixed Calendar: Issues with "Today Pane" start-up
    fixed Calendar: Glitches with custom repeat and reminder number input
    fixed Calendar: Problems with WCAP provider

https://www.thunderbird.net/en-US/thunderbird/68.1.2/releasenotes/

4 files changed, 90 insertions, 7 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 91f7d75d60b..2a55944397b 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.230 2019/10/01 15:15:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.231 2019/10/11 02:02:04 kamil Exp $
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		68.1.1
+TB_VER=		68.1.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 5ee511d1edc..a9e2d2e60ef 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.214 2019/10/01 15:15:33 ryoon Exp $
+$NetBSD: distinfo,v 1.215 2019/10/11 02:02:04 kamil Exp $
 
-SHA1 (thunderbird-68.1.1.source.tar.xz) = 35199e68ee6ed073148781eec5a9333d36310641
-RMD160 (thunderbird-68.1.1.source.tar.xz) = 5cfe7536b0c96c250dad616d19ff9668214d585f
-SHA512 (thunderbird-68.1.1.source.tar.xz) = 946b9694c93bcd416fb2fe1f2448c7304d97a9b8dada9921ea5790cac019b0a53da2666eb974eb416bffd9f7874a51650563daa4dee97fef1091ac3b8df3f2ac
-Size (thunderbird-68.1.1.source.tar.xz) = 330615656 bytes
+SHA1 (thunderbird-68.1.2.source.tar.xz) = a750207dbc4bec2c0024283c21104b2c4adcc045
+RMD160 (thunderbird-68.1.2.source.tar.xz) = 85072fd1d520d84972110394f2f0fb81efb7f4ff
+SHA512 (thunderbird-68.1.2.source.tar.xz) = c6c3cd674e4732f9e98e53dfab5c2dd1ea79bf3595fa4299178e5e4649102fda5c0290858d2962316f2ab1362f8b3494806ab8a0221861ff92088a0248446d76
+Size (thunderbird-68.1.2.source.tar.xz) = 332126436 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = d3ade5620370965e397ba494ff0495aeef5af0d0
 SHA1 (patch-build_moz.configure_old.configure) = edd810f8d607697898ae315453719fe6c8c09bcc
 SHA1 (patch-comm_calendar_lightning_Makefile.in) = d74b7e5c25c76c23350737b2cef689e02d7965f3
@@ -32,6 +32,8 @@ SHA1 (patch-media_libcubeb_src_moz.build) = fd3b036b3ba4105949c6b0f46bf72c89184e
 SHA1 (patch-media_libcubeb_update.sh) = f8d0f674987519a1a1738be158e8cd4296f6def0
 SHA1 (patch-media_libpng_pngpriv.h) = dfd4d345e10f6f74d3a3546732a868481c1d5818
 SHA1 (patch-old-configure.in) = 24c2f64250160c9e4c4cdc3b5ff2e6d33a5d6aad
+SHA1 (patch-third__party_rust_cssparser_.cargo-checksum.json) = aaa0ecb193a2e2f7ce9d86f23dae3266da63dc00
+SHA1 (patch-third__party_rust_cssparser_src_parser.rs) = 0081abcab1cfeccf8ba4f37a906a61277a82c769
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = cd4d65d6e6358b5b77b6b63441a8550f2d1e97c7
 SHA1 (patch-toolkit_library_moz.build) = 429745ec028ce71d8ba2457679b715ac14b6e2d3
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = bc5293f7bf4885443a131958e4099bbf0f2c4a2c
diff --git a/mail/thunderbird/patches/patch-third__party_rust_cssparser_.cargo-checksum.json b/mail/thunderbird/patches/patch-third__party_rust_cssparser_.cargo-checksum.json
new file mode 100644
index 00000000000..8322636a07e
--- /dev/null
+++ b/mail/thunderbird/patches/patch-third__party_rust_cssparser_.cargo-checksum.json
@@ -0,0 +1,14 @@
+$NetBSD: patch-third__party_rust_cssparser_.cargo-checksum.json,v 1.1 2019/10/11 02:02:04 kamil Exp $
+
+esr68 branch fails to build with rust 1.38
+https://bugzilla.mozilla.org/show_bug.cgi?id=1585099
+
+Cherry-pick patch from:
+https://marc.info/?l=openbsd-ports&m=156984549605237&w=2
+
+--- third_party/rust/cssparser/.cargo-checksum.json.orig	2019-10-08 19:44:19.000000000 +0000
++++ third_party/rust/cssparser/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"150d450e43bcb9e523941408be883997ecffce7ff5f224329372edfe56334a55","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"b9d6c5dc56ccc267db9e0e2389061dc2524daefa4baed88b36c98efc7a51c2a9","build.rs":"310d6d7b1931ff783a8aa1a4c6baee87b4c9130c858e4694ef69cc96df5e38dc","build/match_byte.rs":"6f7ec4235c9f2da403ea0be9339661ecd8e1f5e1c788cf88a41448b1080c59b8","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"43f996fbd8da54bd8ffa870f5e3610e5ba6e61543f92a129fa6c850e9b10db7e","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"a474ee88ef8f73fcb7b7272d426e5eafb4ad10d104797a5a188d1676c8180972","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"22067562160a1294fa92779b66c25cbccf259a2ef7dcf687c791fecdd020ce7f","src/rules_and_declarations.rs":"622ce07c117a511d40ce595602d4f4730659a59273388f28553d1a2b0fac92ce","src/serializer.rs":"3e2dfc60613f885cb6f99abfc854fde2a1e00de507431bd2e51178b61abfd69b","src/size_of_tests.rs":"385a0d77fbd6f86cb8013fd8d7541886980876a9da1da714bf175954c0e726cf","src/tests.rs":"9d08b3943d453664e01d58e307f79345e240f9f9ce6f8d36a842eff37155563e","src/tokenizer.rs":"adcf5811955e8df57a519e3d1e44fe3afeb5afeb1076daeb8d36fed1abcf1327","src/unicode_range.rs":"ae159d2ebe4123a6666e18dc0362f89b475240a6b7ed5fb6fe21b9e7a4139da8"},"package":"ba1ab4e1814be64bf6b6064ff532db0e34087f11b37706d6c96a21d32478761d"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"150d450e43bcb9e523941408be883997ecffce7ff5f224329372edfe56334a55","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"b9d6c5dc56ccc267db9e0e2389061dc2524daefa4baed88b36c98efc7a51c2a9","build.rs":"310d6d7b1931ff783a8aa1a4c6baee87b4c9130c858e4694ef69cc96df5e38dc","build/match_byte.rs":"6f7ec4235c9f2da403ea0be9339661ecd8e1f5e1c788cf88a41448b1080c59b8","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"43f996fbd8da54bd8ffa870f5e3610e5ba6e61543f92a129fa6c850e9b10db7e","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"a474ee88ef8f73fcb7b7272d426e5eafb4ad10d104797a5a188d1676c8180972","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"6e8de954fd09fc22fad98aa9b3351e86275eb1506585c5f8e8860a8555d46dd7","src/rules_and_declarations.rs":"622ce07c117a511d40ce595602d4f4730659a59273388f28553d1a2b0fac92ce","src/serializer.rs":"3e2dfc60613f885cb6f99abfc854fde2a1e00de507431bd2e51178b61abfd69b","src/size_of_tests.rs":"385a0d77fbd6f86cb8013fd8d7541886980876a9da1da714bf175954c0e726cf","src/tests.rs":"9d08b3943d453664e01d58e307f79345e240f9f9ce6f8d36a842eff37155563e","src/tokenizer.rs":"adcf5811955e8df57a519e3d1e44fe3afeb5afeb1076daeb8d36fed1abcf1327","src/unicode_range.rs":"ae159d2ebe4123a6666e18dc0362f89b475240a6b7ed5fb6fe21b9e7a4139da8"},"package":"ba1ab4e1814be64bf6b6064ff532db0e34087f11b37706d6c96a21d32478761d"}
diff --git a/mail/thunderbird/patches/patch-third__party_rust_cssparser_src_parser.rs b/mail/thunderbird/patches/patch-third__party_rust_cssparser_src_parser.rs
new file mode 100644
index 00000000000..9cde66fe70e
--- /dev/null
+++ b/mail/thunderbird/patches/patch-third__party_rust_cssparser_src_parser.rs
@@ -0,0 +1,67 @@
+$NetBSD: patch-third__party_rust_cssparser_src_parser.rs,v 1.1 2019/10/11 02:02:04 kamil Exp $
+
+esr68 branch fails to build with rust 1.38
+https://bugzilla.mozilla.org/show_bug.cgi?id=1585099
+
+Cherry-pick patch from:
+https://marc.info/?l=openbsd-ports&m=156984549605237&w=2
+
+--- third_party/rust/cssparser/src/parser.rs.orig	2019-10-11 00:53:23.250060488 +0000
++++ third_party/rust/cssparser/src/parser.rs
+@@ -567,28 +567,35 @@ impl<'i: 't, 't> Parser<'i, 't> {
+         }
+ 
+         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 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()
++
++        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),
++                _ => {}
+             }
+-        }
++            &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);