Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/starship/files/
Date: Tue, 14 Mar 2023 23:01:56
Message-Id: 1678834857.f8ed9f4c83476130501e0e48129f7d1cdc24d97c.conikost@gentoo
1 commit: f8ed9f4c83476130501e0e48129f7d1cdc24d97c
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Mon Mar 13 17:08:38 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 14 23:00:57 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ed9f4c
7
8 app-shells/starship: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/30092
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../files/starship-1.10.3-no-old-time.patch | 109 ---------------------
15 .../files/starship-1.11.0-no-old-time.patch | 109 ---------------------
16 2 files changed, 218 deletions(-)
17
18 diff --git a/app-shells/starship/files/starship-1.10.3-no-old-time.patch b/app-shells/starship/files/starship-1.10.3-no-old-time.patch
19 deleted file mode 100644
20 index bbeca72ae24a..000000000000
21 --- a/app-shells/starship/files/starship-1.10.3-no-old-time.patch
22 +++ /dev/null
23 @@ -1,109 +0,0 @@
24 -From 17dfab50cf27e0023286dcee58810b91906cf1aa Mon Sep 17 00:00:00 2001
25 -From: Alexey Zapparov <alexey@××××××××.com>
26 -Date: Wed, 21 Dec 2022 23:31:59 +0100
27 -Subject: [PATCH] Remove time-0.1.x dependency
28 -
29 -Bug: https://bugs.gentoo.org/864034
30 -See: RUSTSEC-2020-0071 <https://rustsec.org/advisories/RUSTSEC-2020-0071>
31 -See: Upstream Fix Proposal <https://github.com/starship/starship/pull/4750>
32 -Signed-off-by: Alexey Zapparov <alexey@××××××××.com>
33 ----
34 - Cargo.lock | 26 ++++----------------------
35 - Cargo.toml | 2 +-
36 - 2 files changed, 5 insertions(+), 23 deletions(-)
37 -
38 -diff --git a/Cargo.lock b/Cargo.lock
39 -index 010862b3..60b965c0 100644
40 ---- a/Cargo.lock
41 -+++ b/Cargo.lock
42 -@@ -306,7 +306,6 @@ dependencies = [
43 - "js-sys",
44 - "num-integer",
45 - "num-traits",
46 -- "time 0.1.44",
47 - "wasm-bindgen",
48 - "winapi",
49 - ]
50 -@@ -981,7 +980,7 @@ checksum = "1d58ccaaf783384a6ad68a6abf84942a3f88e34970ced3b34dc68183be50996d"
51 - dependencies = [
52 - "bstr",
53 - "itoa",
54 -- "time 0.3.14",
55 -+ "time",
56 - ]
57 -
58 - [[package]]
59 -@@ -1584,7 +1583,7 @@ dependencies = [
60 - "dirs-next",
61 - "objc-foundation",
62 - "objc_id",
63 -- "time 0.3.14",
64 -+ "time",
65 - ]
66 -
67 - [[package]]
68 -@@ -2585,7 +2584,7 @@ checksum = "8c0ea0c68418544f725eba5401a5b965a2263254c92458d04aeae74e9d88ff4e"
69 - dependencies = [
70 - "const_format",
71 - "is_debug",
72 -- "time 0.3.14",
73 -+ "time",
74 - ]
75 -
76 - [[package]]
77 -@@ -2793,7 +2792,7 @@ dependencies = [
78 - "lazy_static",
79 - "libc",
80 - "nom 7.1.1",
81 -- "time 0.3.14",
82 -+ "time",
83 - "winapi",
84 - ]
85 -
86 -@@ -2919,17 +2918,6 @@ dependencies = [
87 - "syn",
88 - ]
89 -
90 --[[package]]
91 --name = "time"
92 --version = "0.1.44"
93 --source = "registry+https://github.com/rust-lang/crates.io-index"
94 --checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
95 --dependencies = [
96 -- "libc",
97 -- "wasi 0.10.0+wasi-snapshot-preview1",
98 -- "winapi",
99 --]
100 --
101 - [[package]]
102 - name = "time"
103 - version = "0.3.14"
104 -@@ -3195,12 +3183,6 @@ version = "0.9.0+wasi-snapshot-preview1"
105 - source = "registry+https://github.com/rust-lang/crates.io-index"
106 - checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
107 -
108 --[[package]]
109 --name = "wasi"
110 --version = "0.10.0+wasi-snapshot-preview1"
111 --source = "registry+https://github.com/rust-lang/crates.io-index"
112 --checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
113 --
114 - [[package]]
115 - name = "wasi"
116 - version = "0.11.0+wasi-snapshot-preview1"
117 -diff --git a/Cargo.toml b/Cargo.toml
118 -index 2fccbe11..8af05383 100644
119 ---- a/Cargo.toml
120 -+++ b/Cargo.toml
121 -@@ -35,7 +35,7 @@ config-schema = ["schemars"]
122 - notify = ["notify-rust"]
123 -
124 - [dependencies]
125 --chrono = { version = "0.4.22", features = ["clock", "std"] }
126 -+chrono = { version = "0.4.22", default-features = false, features = ["clock", "std", "wasmbind"] }
127 - clap = { version = "=3.2.20", features = ["derive", "cargo", "unicode", "unstable-v4"] }
128 - clap_complete = "3.2.4"
129 - dirs-next = "2.0.0"
130 ---
131 -2.38.2
132 -
133
134 diff --git a/app-shells/starship/files/starship-1.11.0-no-old-time.patch b/app-shells/starship/files/starship-1.11.0-no-old-time.patch
135 deleted file mode 100644
136 index ce29faddc59d..000000000000
137 --- a/app-shells/starship/files/starship-1.11.0-no-old-time.patch
138 +++ /dev/null
139 @@ -1,109 +0,0 @@
140 -From 2c8b7cc51f8f88b22f97d435be1c84cec48d89f2 Mon Sep 17 00:00:00 2001
141 -From: Alexey Zapparov <alexey@××××××××.com>
142 -Date: Wed, 21 Dec 2022 23:15:58 +0100
143 -Subject: [PATCH] Remove time-0.1.x dependency
144 -
145 -Bug: https://bugs.gentoo.org/864034
146 -See: RUSTSEC-2020-0071 <https://rustsec.org/advisories/RUSTSEC-2020-0071>
147 -See: Upstream Fix Proposal <https://github.com/starship/starship/pull/4750>
148 -Signed-off-by: Alexey Zapparov <alexey@××××××××.com>
149 ----
150 - Cargo.lock | 26 ++++----------------------
151 - Cargo.toml | 2 +-
152 - 2 files changed, 5 insertions(+), 23 deletions(-)
153 -
154 -diff --git a/Cargo.lock b/Cargo.lock
155 -index db71a4ca..f03af8f7 100644
156 ---- a/Cargo.lock
157 -+++ b/Cargo.lock
158 -@@ -316,7 +316,6 @@ dependencies = [
159 - "js-sys",
160 - "num-integer",
161 - "num-traits",
162 -- "time 0.1.44",
163 - "wasm-bindgen",
164 - "winapi",
165 - ]
166 -@@ -1006,7 +1005,7 @@ dependencies = [
167 - "bstr 1.0.1",
168 - "itoa",
169 - "thiserror",
170 -- "time 0.3.14",
171 -+ "time",
172 - ]
173 -
174 - [[package]]
175 -@@ -1635,7 +1634,7 @@ dependencies = [
176 - "dirs-next",
177 - "objc-foundation",
178 - "objc_id",
179 -- "time 0.3.14",
180 -+ "time",
181 - ]
182 -
183 - [[package]]
184 -@@ -2645,7 +2644,7 @@ checksum = "8c0ea0c68418544f725eba5401a5b965a2263254c92458d04aeae74e9d88ff4e"
185 - dependencies = [
186 - "const_format",
187 - "is_debug",
188 -- "time 0.3.14",
189 -+ "time",
190 - ]
191 -
192 - [[package]]
193 -@@ -2862,7 +2861,7 @@ dependencies = [
194 - "lazy_static",
195 - "libc",
196 - "nom 7.1.1",
197 -- "time 0.3.14",
198 -+ "time",
199 - "winapi",
200 - ]
201 -
202 -@@ -2990,17 +2989,6 @@ dependencies = [
203 - "syn",
204 - ]
205 -
206 --[[package]]
207 --name = "time"
208 --version = "0.1.44"
209 --source = "registry+https://github.com/rust-lang/crates.io-index"
210 --checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
211 --dependencies = [
212 -- "libc",
213 -- "wasi 0.10.0+wasi-snapshot-preview1",
214 -- "winapi",
215 --]
216 --
217 - [[package]]
218 - name = "time"
219 - version = "0.3.14"
220 -@@ -3266,12 +3254,6 @@ version = "0.9.0+wasi-snapshot-preview1"
221 - source = "registry+https://github.com/rust-lang/crates.io-index"
222 - checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
223 -
224 --[[package]]
225 --name = "wasi"
226 --version = "0.10.0+wasi-snapshot-preview1"
227 --source = "registry+https://github.com/rust-lang/crates.io-index"
228 --checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
229 --
230 - [[package]]
231 - name = "wasi"
232 - version = "0.11.0+wasi-snapshot-preview1"
233 -diff --git a/Cargo.toml b/Cargo.toml
234 -index 25202824..c9123cae 100644
235 ---- a/Cargo.toml
236 -+++ b/Cargo.toml
237 -@@ -42,7 +42,7 @@ git-repository-max-perf = ["git-features/zlib-ng", "git-repository/fast-sha1"]
238 - git-repository-faster = ["git-features/zlib-stock", "git-repository/fast-sha1"]
239 -
240 - [dependencies]
241 --chrono = { version = "0.4.22", features = ["clock", "std"] }
242 -+chrono = { version = "0.4.22", default-features = false, features = ["clock", "std", "wasmbind"] }
243 - clap = { version = "4.0.15", features = ["derive", "cargo", "unicode"] }
244 - clap_complete = "4.0.2"
245 - dirs-next = "2.0.0"
246 ---
247 -2.38.2
248 -