diff options
Diffstat (limited to 'repos/extra/librewolf')
| -rw-r--r-- | repos/extra/librewolf/.checksum | 3 | ||||
| -rw-r--r-- | repos/extra/librewolf/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch | 80 | ||||
| -rw-r--r-- | repos/extra/librewolf/abuild | 5 |
3 files changed, 85 insertions, 3 deletions
diff --git a/repos/extra/librewolf/.checksum b/repos/extra/librewolf/.checksum index bb6edd22..74cc193a 100644 --- a/repos/extra/librewolf/.checksum +++ b/repos/extra/librewolf/.checksum @@ -1,2 +1,3 @@ +72e5976122617a501046e99b90762ade92291c7b8ea0bbd8da0b8aadb037ce8a 0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch 504da8aa33992b09a74d8ec262ec6c99752e64fb1d03441f86a49a21a874f95e fix-rust-target.patch -c30aa3fd5786db618bd12f619f201256de1618879cd6eabcf236169354befd54 librewolf-129.0.1-1.source.tar.gz +3fdaa0b074ec2fe697f956fd6b57e89d44d7da06f506d64b4bf666d8a7a00f54 librewolf-129.0.2-1.source.tar.gz diff --git a/repos/extra/librewolf/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch b/repos/extra/librewolf/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch new file mode 100644 index 00000000..a5009db8 --- /dev/null +++ b/repos/extra/librewolf/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch @@ -0,0 +1,80 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> +Date: Sun, 11 Aug 2024 15:12:29 +0000 +Subject: [PATCH] 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 | 16 ++++++++-------- + servo/ports/geckolib/cbindgen.toml | 1 - + 2 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/servo/components/style_traits/values.rs b/servo/components/style_traits/values.rs +index 545dd317de14..1128eb9b315e 100644 +--- a/servo/components/style_traits/values.rs ++++ b/servo/components/style_traits/values.rs +@@ -388,39 +388,39 @@ 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); + } + } + } + } + + impl Separator for CommaWithSpace { + fn separator() -> &'static str { + ", " + } + + fn parse<'i, 't, F, T, E>( + input: &mut Parser<'i, 't>, + mut parse_one: F, + ) -> Result<Vec<T>, ParseError<'i, E>> + 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)); +diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml +index d507293e195d..38ff6504d949 100644 +--- a/servo/ports/geckolib/cbindgen.toml ++++ b/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" diff --git a/repos/extra/librewolf/abuild b/repos/extra/librewolf/abuild index 27f115d3..6f9da36a 100644 --- a/repos/extra/librewolf/abuild +++ b/repos/extra/librewolf/abuild @@ -1,11 +1,12 @@ name=librewolf -version=129.0.1.1 +version=129.0.2.1 _ver=${version%.*} _sion=${version##*.} _version=${_ver}-${_sion} release=1 source="https://gitlab.com/api/v4/projects/32320088/packages/generic/${name}-source/${_version}/${name}-${_version}.source.tar.gz - fix-rust-target.patch" + fix-rust-target.patch + 0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch" build() { export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system |