CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 13 21:42:51 UTC 2024

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

Log Message:
firefox: fix build with cbindgen 0.27

Using upstream patches.


To generate a diff of this commit:
cvs rdiff -u -r1.539 -r1.540 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/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/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.539 pkgsrc/www/firefox/distinfo:1.540
--- pkgsrc/www/firefox/distinfo:1.539   Sat Aug 24 02:31:14 2024
+++ pkgsrc/www/firefox/distinfo Fri Sep 13 21:42:51 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.539 2024/08/24 02:31:14 ryoon Exp $
+$NetBSD: distinfo,v 1.540 2024/09/13 21:42:51 wiz Exp $
 
 BLAKE2s (firefox-129.0.2.source.tar.xz) = c7c48e7122b14a98e3af30b6032941439636c520dd52e9a5741192c5efe70e8c
 SHA512 (firefox-129.0.2.source.tar.xz) = f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13
@@ -34,6 +34,8 @@ SHA1 (patch-netwerk_protocol_http_nsHttp
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
 SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = d95a09c2e7a25888d6009dfe169ba459783dead4
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
+SHA1 (patch-servo_components_style__traits_values.rs) = 6e1efb51bd68168abfa960b5e2541b3f46a49bf0
+SHA1 (patch-servo_ports_geckolib_cbindgen.toml) = f87b82cf179651199599f7b8c5d4feaa11b1f781
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_desktop__capture__gn_moz.build) = d0454784eb72be49162f619579e060a0de3c480f
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583

Added files:

Index: pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs:1.3
--- /dev/null   Fri Sep 13 21:42:51 2024
+++ pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs   Fri Sep 13 21:42:51 2024
@@ -0,0 +1,47 @@
+$NetBSD: patch-servo_components_style__traits_values.rs,v 1.3 2024/09/13 21:42:51 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-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/www/firefox/patches/patch-servo_ports_geckolib_cbindgen.toml
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_ports_geckolib_cbindgen.toml:1.1
--- /dev/null   Fri Sep 13 21:42:51 2024
+++ pkgsrc/www/firefox/patches/patch-servo_ports_geckolib_cbindgen.toml Fri Sep 13 21:42:51 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-servo_ports_geckolib_cbindgen.toml,v 1.1 2024/09/13 21:42:51 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-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"