diff --git a/firefox/.signature b/firefox/.signature index 758b8c62b..9dcd370cf 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF360PAg4hg7MXte73FAeiaVyv7Kudw+FDIM4jvv+7OZpB4s0Vbjf0Bd0Uiiyn0KcFApXf/cMYwkLlCnOgivtNXwA= -SHA256 (Pkgfile) = 0a6681b9978885b7bf5557ee369c18863402fd1b9344a00b3a2ddffba0104ff4 +RWSagIOpLGJF331+qtaQOTcus22sLuYCWmWlK7xPS7TqrRzbpAyX4uC6YVtkSWHdpwkImWvMGmarglCbgX73y9F4zDqfMH2wUg8= +SHA256 (Pkgfile) = e07c75277b244edf199d36b600ff93f460ac6e07c9f23162393d1f52130dbea6 SHA256 (.footprint) = 2bf9d0db0db4636671ffc262a68acd4536e6cedcae47ecb26d5dbf87483a66ef -SHA256 (firefox-129.0.1.source.tar.xz) = 9ddfe823e4c22167a77e47f56a8afde0d9621784a9e4e5dba4906e758175c073 +SHA256 (firefox-129.0.2.source.tar.xz) = 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344 SHA256 (firefox.desktop) = a092fddc62bf5bff0c0f7891f59278463fa9b6ec24e9d811e49cd10b2282bdee SHA256 (icu-linebreak-classes.patch) = bdfd2a93be5eed5c723ae67b308c4c2d9ed91d3173839fe560a7ca47946c7813 SHA256 (fix-target-detection.patch) = 33199c6d64a2a775b4ede35aae84b95cef8476e8995a1d1b99eb65efb59008f4 +SHA256 (fix-for-cbindgen-0.27.patch) = fdd8666af08a8467f8f79e11bd1376fa7b93696b77a22f20c00fe8fac1ad8da2 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index e10374d3e..2dcbd826f 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -5,12 +5,13 @@ # Optional: apulse jack pulseaudio pipewire sndio sccache lld wayland name=firefox -version=129.0.1 +version=129.0.2 release=1 source=(https://ftp.mozilla.org/pub/$name/releases/$version/source/$name-$version.source.tar.xz firefox.desktop icu-linebreak-classes.patch fix-target-detection.patch + fix-for-cbindgen-0.27.patch node-stdout-nonblocking-wrapper) build() { diff --git a/firefox/fix-for-cbindgen-0.27.patch b/firefox/fix-for-cbindgen-0.27.patch new file mode 100644 index 000000000..f04f272ac --- /dev/null +++ b/firefox/fix-for-cbindgen-0.27.patch @@ -0,0 +1,94 @@ + +# HG changeset patch +# User Emilio Cobos Álvarez +# Date 1723389149 0 +# Node ID 98cd34c7ff5740b62e6c0c432799cd37fe017005 +# Parent 0d743db7da62389442a78d216091b0917ff33589 +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 + +diff --git a/servo/components/style_traits/values.rs b/servo/components/style_traits/values.rs +--- a/servo/components/style_traits/values.rs ++++ b/servo/components/style_traits/values.rs +@@ -384,21 +384,21 @@ impl Separator for Space { + + fn parse<'i, 't, F, T, E>( + input: &mut Parser<'i, 't>, + mut parse_one: F, + ) -> Result, ParseError<'i, E>> + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result>, + { +- 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); + } + } + } + } + +@@ -409,24 +409,24 @@ impl Separator for CommaWithSpace { + + fn parse<'i, 't, F, T, E>( + input: &mut Parser<'i, 't>, + mut parse_one: F, + ) -> Result, ParseError<'i, E>> + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result>, + { +- 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)); + } else { + break; + } + } + Ok(results) +diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml +--- a/servo/ports/geckolib/cbindgen.toml ++++ b/servo/ports/geckolib/cbindgen.toml +@@ -357,17 +357,16 @@ renaming_overrides_prefixing = true + "gfxFontFeatureValueSet" = "gfxFontFeatureValueSet" + "GeckoFontMetrics" = "GeckoFontMetrics" + "SeenPtrs" = "SeenPtrs" + "gfxFontVariation" = "gfxFontVariation" + "URLExtraData" = "URLExtraData" + "Keyframe" = "Keyframe" + "nsChangeHint" = "nsChangeHint" + "ServoElementSnapshotTable" = "ServoElementSnapshotTable" +-"Keyframe" = "Keyframe" + "ComputedKeyframeValues" = "ComputedKeyframeValues" + "OriginFlags" = "OriginFlags" + "ServoTraversalFlags" = "ServoTraversalFlags" + "ServoStyleSetSizes" = "ServoStyleSetSizes" + "BeforeFlag" = "StyleEasingBeforeFlag" + "FontPaletteValueSet" = "gfx::FontPaletteValueSet" + "PaletteValues" = "gfx::FontPaletteValueSet::PaletteValues" + "ThinVec" = "CopyableTArray" +