CVS commit: pkgsrc/www/firefox102

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Sep 18 09:17:30 UTC 2024

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

Log Message:
firefox102: apply cbindgen fix for 0.27 here as well

Still doesn't build for me though.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/firefox102/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox102/patches/patch-servo_components_style__traits_values.rs \
    pkgsrc/www/firefox102/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/firefox102/distinfo
diff -u pkgsrc/www/firefox102/distinfo:1.18 pkgsrc/www/firefox102/distinfo:1.19
--- pkgsrc/www/firefox102/distinfo:1.18 Fri May 10 09:14:07 2024
+++ pkgsrc/www/firefox102/distinfo      Wed Sep 18 09:17:29 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2024/05/10 09:14:07 jperkin Exp $
+$NetBSD: distinfo,v 1.19 2024/09/18 09:17:29 wiz Exp $
 
 BLAKE2s (firefox-102.15.1esr.source.tar.xz) = 1dae9aa46405c07d2dcff2c0f74677925b646020c1722ff1034a39c2adb1e5bd
 SHA512 (firefox-102.15.1esr.source.tar.xz) = bdb66b4fb5622af3e60580a3bcd464d98ef13cb38d6ac6c9e5fc046e567a003cf080125d7748950c91c442fde5e8024c50c4180d2f551aa3528160a3c05ae187
@@ -35,6 +35,8 @@ SHA1 (patch-modules_fdlibm_src_math__pri
 SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
+SHA1 (patch-servo_components_style__traits_values.rs) = 38b64d5a0edc3e9e94eafa1171cdb7b02e87ba2a
+SHA1 (patch-servo_ports_geckolib_cbindgen.toml) = b2a3b330666e1cd8d1e88fe760a1fea63fcef80c
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc) = 2e951d7d91934751608e99628fc144632d8a3b5c
 SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8

Added files:

Index: pkgsrc/www/firefox102/patches/patch-servo_components_style__traits_values.rs
diff -u /dev/null pkgsrc/www/firefox102/patches/patch-servo_components_style__traits_values.rs:1.1
--- /dev/null   Wed Sep 18 09:17:30 2024
+++ pkgsrc/www/firefox102/patches/patch-servo_components_style__traits_values.rs        Wed Sep 18 09:17:30 2024
@@ -0,0 +1,47 @@
+$NetBSD: patch-servo_components_style__traits_values.rs,v 1.1 2024/09/18 09:17:30 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       2023-09-12 04:31:55.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/firefox102/patches/patch-servo_ports_geckolib_cbindgen.toml
diff -u /dev/null pkgsrc/www/firefox102/patches/patch-servo_ports_geckolib_cbindgen.toml:1.1
--- /dev/null   Wed Sep 18 09:17:30 2024
+++ pkgsrc/www/firefox102/patches/patch-servo_ports_geckolib_cbindgen.toml      Wed Sep 18 09:17:30 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-servo_ports_geckolib_cbindgen.toml,v 1.1 2024/09/18 09:17:30 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    2023-09-12 04:31:55.000000000 +0000
++++ servo/ports/geckolib/cbindgen.toml
+@@ -293,7 +293,6 @@ renaming_overrides_prefixing = true
+ "nsChangeHint" = "nsChangeHint"
+ "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
+ "nsTimingFunction" = "nsTimingFunction"
+-"Keyframe" = "Keyframe"
+ "ComputedKeyframeValues" = "ComputedKeyframeValues"
+ "OriginFlags" = "OriginFlags"
+ "ServoTraversalFlags" = "ServoTraversalFlags"