CVS commit: pkgsrc/www/firefox115

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Sep 18 07:27:42 UTC 2024

Modified Files:
        pkgsrc/www/firefox115: distinfo
Added Files:
        pkgsrc/www/firefox115/patches:
            patch-servo_components_style__traits_values.rs
            patch-servo_ports_geckolib_cbindgen.toml

Log Message:
firefox115: fix build with latest cbindgen


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/firefox115/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox115/patches/patch-servo_components_style__traits_values.rs \
    pkgsrc/www/firefox115/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/www/firefox115/distinfo
diff -u pkgsrc/www/firefox115/distinfo:1.15 pkgsrc/www/firefox115/distinfo:1.16
--- pkgsrc/www/firefox115/distinfo:1.15 Wed Sep 11 05:33:18 2024
+++ pkgsrc/www/firefox115/distinfo      Wed Sep 18 07:27:42 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/09/11 05:33:18 gutteridge Exp $
+$NetBSD: distinfo,v 1.16 2024/09/18 07:27:42 wiz Exp $
 
 BLAKE2s (firefox-115.15.0esr.source.tar.xz) = 64673bf84111036a5d7efda8fa152356fc71ea195cb14d4b90d7c7f0431fe16b
 SHA512 (firefox-115.15.0esr.source.tar.xz) = 0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba
@@ -35,6 +35,8 @@ SHA1 (patch-modules_fdlibm_src_math__pri
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
 SHA1 (patch-rust-1.78.0) = aa83482a831ab2ee8b38f57c1b7873719e5f8b5b
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
+SHA1 (patch-servo_components_style__traits_values.rs) = 335365fd58a71a8e60d93ec0efcb11eeb94d6d09
+SHA1 (patch-servo_ports_geckolib_cbindgen.toml) = 71b4d2432176fbc5b21dc3c70fec7f9a92fb69e1
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4

Added files:

Index: pkgsrc/www/firefox115/patches/patch-servo_components_style__traits_values.rs
diff -u /dev/null pkgsrc/www/firefox115/patches/patch-servo_components_style__traits_values.rs:1.1
--- /dev/null   Wed Sep 18 07:27:42 2024
+++ pkgsrc/www/firefox115/patches/patch-servo_components_style__traits_values.rs        Wed Sep 18 07:27:42 2024
@@ -0,0 +1,47 @@
+$NetBSD: patch-servo_components_style__traits_values.rs,v 1.1 2024/09/18 07:27:42 wiz 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-26 14:25:35.000000000 +0000
++++ servo/components/style_traits/values.rs
+@@ -374,11 +374,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);
+@@ -399,14 +399,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/www/firefox115/patches/patch-servo_ports_geckolib_cbindgen.toml
diff -u /dev/null pkgsrc/www/firefox115/patches/patch-servo_ports_geckolib_cbindgen.toml:1.1
--- /dev/null   Wed Sep 18 07:27:42 2024
+++ pkgsrc/www/firefox115/patches/patch-servo_ports_geckolib_cbindgen.toml      Wed Sep 18 07:27:42 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-servo_ports_geckolib_cbindgen.toml,v 1.1 2024/09/18 07:27:42 wiz 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-26 14:25:35.000000000 +0000
++++ servo/ports/geckolib/cbindgen.toml
+@@ -318,7 +318,6 @@ renaming_overrides_prefixing = true
+ "Keyframe" = "Keyframe"
+ "nsChangeHint" = "nsChangeHint"
+ "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
+-"Keyframe" = "Keyframe"
+ "ComputedKeyframeValues" = "ComputedKeyframeValues"
+ "OriginFlags" = "OriginFlags"
+ "ServoTraversalFlags" = "ServoTraversalFlags"