From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/
Date: Sun, 6 Oct 2019 16:25:45 +0000 (UTC) [thread overview]
Message-ID: <1570378834.ea36c2c249bbbe03b49eec6263c6fc63219efc9c.whissi@gentoo> (raw)
commit: ea36c2c249bbbe03b49eec6263c6fc63219efc9c
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 6 16:20:28 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 6 16:20:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea36c2c2
www-client/firefox: fix build with >=rust-1.38.0
Bug: https://bugs.gentoo.org/695794
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../files/firefox-60.9.0-rust-1.38-compat.patch | 58 ++++++++++++++++++++++
www-client/firefox/firefox-60.9.0.ebuild | 1 +
2 files changed, 59 insertions(+)
diff --git a/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch b/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
new file mode 100644
index 00000000000..a9183f24e0f
--- /dev/null
+++ b/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
@@ -0,0 +1,58 @@
+--- firefox-60.9.0/third_party/rust/cssparser/.cargo-checksum.json
++++ firefox-60.9.0_b/third_party/rust/cssparser/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558
f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
+\ No newline at end of file
++{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558
f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"5f36cd1b18562e427222147ca7c971a1a65c32fbbc8bdd00c57c4dd2f5823fa0","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
+--- firefox-60.9.0/third_party/rust/cssparser/src/parser.rs
++++ firefox-60.9.0_b/third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+ }
+
+ let token_start_position = self.input.tokenizer.position();
+- let token;
+- match self.input.cached_token {
+- Some(ref cached_token)
+- if cached_token.start_position == token_start_position => {
+- self.input.tokenizer.reset(&cached_token.end_state);
+- match cached_token.token {
+- Token::Function(ref name) => self.input.tokenizer.see_function(name),
+- _ => {}
+- }
+- token = &cached_token.token
++ let using_cached_token = self
++ .input
++ .cached_token
++ .as_ref()
++ .map_or(false, |cached_token| {
++ cached_token.start_position == token_start_position
++ });
++ let token = if using_cached_token {
++ let cached_token = self.input.cached_token.as_ref().unwrap();
++ self.input.tokenizer.reset(&cached_token.end_state);
++ match cached_token.token {
++ Token::Function(ref name) => self.input.tokenizer.see_function(name),
++ _ => {}
+ }
+- _ => {
+- let new_token = self.input.tokenizer.next()
++ &cached_token.token
++ } else {
++ let new_token = self
++ .input
++ .tokenizer
++ .next()
+ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+ self.input.cached_token = Some(CachedToken {
+ token: new_token,
+ start_position: token_start_position,
+ end_state: self.input.tokenizer.state(),
+ });
+- token = self.input.cached_token_ref()
+- }
+- }
++ self.input.cached_token_ref()
++ };
+
+ if let Some(block_type) = BlockType::opening(token) {
+ self.at_start_of = Some(block_type);
diff --git a/www-client/firefox/firefox-60.9.0.ebuild b/www-client/firefox/firefox-60.9.0.ebuild
index 15b95565ee8..dbac97b227d 100644
--- a/www-client/firefox/firefox-60.9.0.ebuild
+++ b/www-client/firefox/firefox-60.9.0.ebuild
@@ -139,6 +139,7 @@ src_unpack() {
src_prepare() {
eapply "${WORKDIR}/firefox"
+ eapply "${FILESDIR}"/firefox-60.9.0-rust-1.38-compat.patch
# Enable gnomebreakpad
if use debug ; then
next reply other threads:[~2019-10-06 16:25 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-06 16:25 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-12 12:02 [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/ Joonas Niilola
2025-03-04 21:01 Joonas Niilola
2025-03-03 20:17 Joonas Niilola
2023-11-20 18:34 Sam James
2023-06-26 21:49 Georgy Yakovlev
2023-04-11 5:14 Joonas Niilola
2023-01-23 7:07 Georgy Yakovlev
2022-06-09 13:48 Joonas Niilola
2021-08-11 1:38 Thomas Deutschmann
2020-12-10 15:19 Thomas Deutschmann
2020-10-03 18:09 Thomas Deutschmann
2020-04-12 13:14 Thomas Deutschmann
2020-04-02 21:19 Thomas Deutschmann
2020-03-30 13:47 Thomas Deutschmann
2020-03-30 11:46 Thomas Deutschmann
2020-03-12 14:16 Thomas Deutschmann
2020-03-11 19:21 Thomas Deutschmann
2020-02-14 13:09 Jory Pratt
2020-01-06 17:43 Jory Pratt
2019-12-13 1:16 Thomas Deutschmann
2019-10-22 19:28 Thomas Deutschmann
2019-09-18 21:29 Thomas Deutschmann
2018-12-13 15:45 Thomas Deutschmann
2018-11-04 15:27 Thomas Deutschmann
2018-11-04 14:54 Thomas Deutschmann
2018-10-02 9:00 Thomas Deutschmann
2018-09-08 13:34 Thomas Deutschmann
2018-06-28 21:42 Jory Pratt
2017-04-14 2:27 Ian Stakenvicius
2016-10-13 20:53 Ian Stakenvicius
2016-08-11 8:28 Andrew Savchenko
2016-07-06 21:28 Ian Stakenvicius
2016-06-08 2:33 Ian Stakenvicius
2016-04-29 18:17 Ian Stakenvicius
2015-12-16 18:40 Ian Stakenvicius
2015-08-23 13:17 Ian Stakenvicius
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1570378834.ea36c2c249bbbe03b49eec6263c6fc63219efc9c.whissi@gentoo \
--to=whissi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox