CVS commit: pkgsrc/mail/thunderbird

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Sep 23 23:55:18 UTC 2024

Modified Files:
        pkgsrc/mail/thunderbird: distinfo
Added Files:
        pkgsrc/mail/thunderbird/patches:
            patch-servo_components_style__traits_values.rs
            patch-servo_ports_geckolib_cbindgen.toml

Log Message:
mail/thunderbird: Remediate cbindgen instability

This commit cherry-picks two patches from www/firefox, which are
themselves cherry-picks from upstream mozilla.  The build gets vastly
further, and might even succeed.


To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/patches/patch-servo_components_style__traits_values.rs \
    pkgsrc/mail/thunderbird/patches/patch-servo_ports_geckolib_cbindgen.toml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.270 pkgsrc/mail/thunderbird/distinfo:1.271
--- pkgsrc/mail/thunderbird/distinfo:1.270      Tue Aug 20 14:11:52 2024
+++ pkgsrc/mail/thunderbird/distinfo    Mon Sep 23 23:55:18 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.270 2024/08/20 14:11:52 ryoon Exp $
+$NetBSD: distinfo,v 1.271 2024/09/23 23:55:18 gdt Exp $
 
 BLAKE2s (thunderbird-115.14.0.source.tar.xz) = 2b8644a48ba3afcea1dda9f73fa84ba49e5b85f844fab5bba8f84c712aac4780
 SHA512 (thunderbird-115.14.0.source.tar.xz) = b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29
@@ -31,6 +31,8 @@ SHA1 (patch-nsprpub_pr_src_pthreads_ptsy
 SHA1 (patch-old-configure.in) = d59d276124e1f95d9e144b8f7099abcf6de0489a
 SHA1 (patch-rust-1.78.0) = aa83482a831ab2ee8b38f57c1b7873719e5f8b5b
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = 0cbf185955c77c9438ced0c294fbc8e4824797bf
+SHA1 (patch-servo_components_style__traits_values.rs) = 6e1efb51bd68168abfa960b5e2541b3f46a49bf0
+SHA1 (patch-servo_ports_geckolib_cbindgen.toml) = f87b82cf179651199599f7b8c5d4feaa11b1f781
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4
 SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e9378a3868ddb628213c3a37e2177257c2344bc3
 SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-servo_components_style__traits_values.rs
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-servo_components_style__traits_values.rs:1.1
--- /dev/null   Mon Sep 23 23:55:18 2024
+++ pkgsrc/mail/thunderbird/patches/patch-servo_components_style__traits_values.rs      Mon Sep 23 23:55:18 2024
@@ -0,0 +1,47 @@
+$NetBSD: patch-servo_components_style__traits_values.rs,v 1.1 2024/09/23 23:55:18 gdt Exp $
+
+Bug 1912663 - Fix some build issues with cbindgen 0.27. r=firefox-style-system-reviewers,zrhoffman
+
+It updates serde and syn and they are more strict. In particular, syn 2
+doesn't parse the rust 2015 syntax where try is not a keyword, and serde
+rejects duplicate keys.
+
+Differential Revision: https://phabricator.services.mozilla.com/D219025
+
+--- servo/components/style_traits/values.rs.orig       2024-08-19 19:21:51.000000000 +0000
++++ servo/components/style_traits/values.rs
+@@ -388,11 +388,11 @@ impl Separator for Space {
+     where
+         F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+     {
+-        input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++        input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+         let mut results = vec![parse_one(input)?];
+         loop {
+-            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
+-            if let Ok(item) = input.try(&mut parse_one) {
++            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
++            if let Ok(item) = input.try_parse(&mut parse_one) {
+                 results.push(item);
+             } else {
+                 return Ok(results);
+@@ -413,14 +413,14 @@ impl Separator for CommaWithSpace {
+     where
+         F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+     {
+-        input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++        input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+         let mut results = vec![parse_one(input)?];
+         loop {
+-            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+             let comma_location = input.current_source_location();
+-            let comma = input.try(|i| i.expect_comma()).is_ok();
+-            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
+-            if let Ok(item) = input.try(&mut parse_one) {
++            let comma = input.try_parse(|i| i.expect_comma()).is_ok();
++            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
++            if let Ok(item) = input.try_parse(&mut parse_one) {
+                 results.push(item);
+             } else if comma {
+                 return Err(comma_location.new_unexpected_token_error(Token::Comma));
Index: pkgsrc/mail/thunderbird/patches/patch-servo_ports_geckolib_cbindgen.toml
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-servo_ports_geckolib_cbindgen.toml:1.1
--- /dev/null   Mon Sep 23 23:55:18 2024
+++ pkgsrc/mail/thunderbird/patches/patch-servo_ports_geckolib_cbindgen.toml    Mon Sep 23 23:55:18 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-servo_ports_geckolib_cbindgen.toml,v 1.1 2024/09/23 23:55:18 gdt Exp $
+
+Bug 1912663 - Fix some build issues with cbindgen 0.27. r=firefox-style-system-reviewers,zrhoffman
+
+It updates serde and syn and they are more strict. In particular, syn 2
+doesn't parse the rust 2015 syntax where try is not a keyword, and serde
+rejects duplicate keys.
+
+Differential Revision: https://phabricator.services.mozilla.com/D219025
+
+--- servo/ports/geckolib/cbindgen.toml.orig    2024-08-19 19:21:52.000000000 +0000
++++ servo/ports/geckolib/cbindgen.toml
+@@ -360,7 +360,6 @@ renaming_overrides_prefixing = true
+ "Keyframe" = "Keyframe"
+ "nsChangeHint" = "nsChangeHint"
+ "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
+-"Keyframe" = "Keyframe"
+ "ComputedKeyframeValues" = "ComputedKeyframeValues"
+ "OriginFlags" = "OriginFlags"
+ "ServoTraversalFlags" = "ServoTraversalFlags"