Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/files/
Date: Wed, 13 Nov 2019 21:27:36
Message-Id: 1573680417.b996a8973c3e255519deccfcb5523ac14dd143d6.anarchy@gentoo
1 commit: b996a8973c3e255519deccfcb5523ac14dd143d6
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Nov 13 17:14:28 2019 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 13 21:26:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b996a897
7
8 www-client/firefox: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/13634
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
13
14 .../files/firefox-60.9.0-rust-1.38-compat.patch | 58 ----------------------
15 1 file changed, 58 deletions(-)
16
17 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
18 deleted file mode 100644
19 index a9183f24e0f..00000000000
20 --- a/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
21 +++ /dev/null
22 @@ -1,58 +0,0 @@
23 ---- firefox-60.9.0/third_party/rust/cssparser/.cargo-checksum.json
24 -+++ firefox-60.9.0_b/third_party/rust/cssparser/.cargo-checksum.json
25 -@@ -1 +1 @@
26 --{"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
27 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"}
28 -\ No newline at end of file
29 -+{"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
30 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"}
31 ---- firefox-60.9.0/third_party/rust/cssparser/src/parser.rs
32 -+++ firefox-60.9.0_b/third_party/rust/cssparser/src/parser.rs
33 -@@ -555,28 +555,34 @@
34 - }
35 -
36 - let token_start_position = self.input.tokenizer.position();
37 -- let token;
38 -- match self.input.cached_token {
39 -- Some(ref cached_token)
40 -- if cached_token.start_position == token_start_position => {
41 -- self.input.tokenizer.reset(&cached_token.end_state);
42 -- match cached_token.token {
43 -- Token::Function(ref name) => self.input.tokenizer.see_function(name),
44 -- _ => {}
45 -- }
46 -- token = &cached_token.token
47 -+ let using_cached_token = self
48 -+ .input
49 -+ .cached_token
50 -+ .as_ref()
51 -+ .map_or(false, |cached_token| {
52 -+ cached_token.start_position == token_start_position
53 -+ });
54 -+ let token = if using_cached_token {
55 -+ let cached_token = self.input.cached_token.as_ref().unwrap();
56 -+ self.input.tokenizer.reset(&cached_token.end_state);
57 -+ match cached_token.token {
58 -+ Token::Function(ref name) => self.input.tokenizer.see_function(name),
59 -+ _ => {}
60 - }
61 -- _ => {
62 -- let new_token = self.input.tokenizer.next()
63 -+ &cached_token.token
64 -+ } else {
65 -+ let new_token = self
66 -+ .input
67 -+ .tokenizer
68 -+ .next()
69 - .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
70 - self.input.cached_token = Some(CachedToken {
71 - token: new_token,
72 - start_position: token_start_position,
73 - end_state: self.input.tokenizer.state(),
74 - });
75 -- token = self.input.cached_token_ref()
76 -- }
77 -- }
78 -+ self.input.cached_token_ref()
79 -+ };
80 -
81 - if let Some(block_type) = BlockType::opening(token) {
82 - self.at_start_of = Some(block_type);