From 2ca18d69d305843cf1711537cff86f4d9ce22357 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 13 Aug 2024 19:18:03 +0000 Subject: [PATCH] extra/firefox to 129.0.1-1 --- extra/firefox/.SRCINFO | 13 +-- ...some-build-issues-with-cbindgen-0.27.patch | 80 +++++++++++++++++++ extra/firefox/PKGBUILD | 17 ++-- 3 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 extra/firefox/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch diff --git a/extra/firefox/.SRCINFO b/extra/firefox/.SRCINFO index 037839857..eaf8b27f1 100644 --- a/extra/firefox/.SRCINFO +++ b/extra/firefox/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = firefox pkgdesc = Fast, Private & Safe Web Browser - pkgver = 129.0 + pkgver = 129.0.1 pkgrel = 1 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -63,16 +63,17 @@ pkgbase = firefox options = !emptydirs options = !lto options = !makeflags - source = https://archive.mozilla.org/pub/firefox/releases/129.0/source/firefox-129.0.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/129.0/source/firefox-129.0.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/129.0.1/source/firefox-129.0.1.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/129.0.1/source/firefox-129.0.1.source.tar.xz.asc source = firefox-symbolic.svg source = firefox.desktop source = org.mozilla.firefox.metainfo.xml source = 0001-Bug-1898476-Wayland-Move-MozContainerSurfaceLock-fro.patch source = 0002-Bug-1898476-Wayland-Provide-surface-lock-by-GtkCompo.patch source = 0003-Bug-1898476-Wayland-Lock-Wayland-surface-before-Swap.patch + source = 0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = 4b9ff955de7099f09aa1f00985e34695fa1a911e56c2d46cb4d60c3bff3d9174 + sha256sums = 9ddfe823e4c22167a77e47f56a8afde0d9621784a9e4e5dba4906e758175c073 sha256sums = SKIP sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9 sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044 @@ -80,7 +81,8 @@ pkgbase = firefox sha256sums = f4e1db05768325bce5f38b67263c47b3aa4038cfadbdbf8a9e0cbec061a58c57 sha256sums = 588b0b94fe188c5f0a133a8bfd88d7d60123315e6f509b119728409ff164419f sha256sums = cbe19f6c95d27d50e3b6664907f8d084784162ea35d5d98fadbb91dbb77ef700 - b2sums = abd8b0008dfd0948234baf7c307c42051e2f58a9c7ebd07b3b0dec9bdb6d8d78e4e1ae25d552aba8685e8b307dbdeb1360d873fef98ac108671dbbbc53c2a3af + sha256sums = dd2aba1c02c21b89ceed0713a6aa0241365fe79b1e3a4d21cdcd7231db6fab5e + b2sums = e3c1a3db5a481839c862bef6ace6f977e601fc85f308980f7d0073a3ab04b5ac611ed3edf3fc4b71c09008e0f54009f78b64e64c5d0cb63c86798138031bfee1 b2sums = SKIP b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34 b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628 @@ -88,5 +90,6 @@ pkgbase = firefox b2sums = 2d4c421aec450c85c25554a8f312df8b74bb184e13fdd631ec7b34abbc3e5b1015fdef8d7ee637638c916f8bdd9cecfcb9c2713055471feb863888fd238e288e b2sums = 884183ba979c844a2119dbb28cb1bbe64228b1a1a6b020abea9dfb5bd60487853a1da1012e157b8149f3e89b3d35c76042aa143b28fd55b0120edb03c63f9a81 b2sums = b649c5c3edc4a0319d012ff0c12dbc97f3bb244220c9db5334a921864f57e05506943f50ccd7ee832b881ace642ce294892e25eaa555716d2dcc726f4790c605 + b2sums = eb84ee67ce049351e07cfd02f7bd024fb31e041f839c105e3bc15a904632b6c668bca494aa721f0c092172dc45ad2d576c9f6d45f15877f7189e15ab403a45c5 pkgname = firefox diff --git a/extra/firefox/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch b/extra/firefox/0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch new file mode 100644 index 000000000..a5009db8e --- /dev/null +++ b/extra/firefox/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?= +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>, + { +- 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, 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)); +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/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index ff4540e00..9492f66df 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -11,7 +11,7 @@ highmem=1 pkgname=firefox -pkgver=129.0 +pkgver=129.0.1 pkgrel=1 pkgdesc="Fast, Private & Safe Web Browser" url="https://www.mozilla.org/firefox/" @@ -87,28 +87,31 @@ source=( 0001-Bug-1898476-Wayland-Move-MozContainerSurfaceLock-fro.patch 0002-Bug-1898476-Wayland-Provide-surface-lock-by-GtkCompo.patch 0003-Bug-1898476-Wayland-Lock-Wayland-surface-before-Swap.patch + 0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch ) validpgpkeys=( # Mozilla Software Releases # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/ 14F26682D0916CDD81E37B6D61B7B526D98F0353 ) -sha256sums=('4b9ff955de7099f09aa1f00985e34695fa1a911e56c2d46cb4d60c3bff3d9174' +sha256sums=('9ddfe823e4c22167a77e47f56a8afde0d9621784a9e4e5dba4906e758175c073' 'SKIP' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044' '58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1' 'f4e1db05768325bce5f38b67263c47b3aa4038cfadbdbf8a9e0cbec061a58c57' '588b0b94fe188c5f0a133a8bfd88d7d60123315e6f509b119728409ff164419f' - 'cbe19f6c95d27d50e3b6664907f8d084784162ea35d5d98fadbb91dbb77ef700') -b2sums=('abd8b0008dfd0948234baf7c307c42051e2f58a9c7ebd07b3b0dec9bdb6d8d78e4e1ae25d552aba8685e8b307dbdeb1360d873fef98ac108671dbbbc53c2a3af' + 'cbe19f6c95d27d50e3b6664907f8d084784162ea35d5d98fadbb91dbb77ef700' + 'dd2aba1c02c21b89ceed0713a6aa0241365fe79b1e3a4d21cdcd7231db6fab5e') +b2sums=('e3c1a3db5a481839c862bef6ace6f977e601fc85f308980f7d0073a3ab04b5ac611ed3edf3fc4b71c09008e0f54009f78b64e64c5d0cb63c86798138031bfee1' 'SKIP' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' 'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628' '2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14' '2d4c421aec450c85c25554a8f312df8b74bb184e13fdd631ec7b34abbc3e5b1015fdef8d7ee637638c916f8bdd9cecfcb9c2713055471feb863888fd238e288e' '884183ba979c844a2119dbb28cb1bbe64228b1a1a6b020abea9dfb5bd60487853a1da1012e157b8149f3e89b3d35c76042aa143b28fd55b0120edb03c63f9a81' - 'b649c5c3edc4a0319d012ff0c12dbc97f3bb244220c9db5334a921864f57e05506943f50ccd7ee832b881ace642ce294892e25eaa555716d2dcc726f4790c605') + 'b649c5c3edc4a0319d012ff0c12dbc97f3bb244220c9db5334a921864f57e05506943f50ccd7ee832b881ace642ce294892e25eaa555716d2dcc726f4790c605' + 'eb84ee67ce049351e07cfd02f7bd024fb31e041f839c105e3bc15a904632b6c668bca494aa721f0c092172dc45ad2d576c9f6d45f15877f7189e15ab403a45c5') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -134,6 +137,10 @@ prepare() { patch -Np1 -i ../0002-Bug-1898476-Wayland-Provide-surface-lock-by-GtkCompo.patch patch -Np1 -i ../0003-Bug-1898476-Wayland-Lock-Wayland-surface-before-Swap.patch + # Fix build with cinbdgen 0.27.0 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663 + patch -Np1 -i ../0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch + echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key