From: RossComputerGuy <RossComputerGuy@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] cargo: added patch for #28372
Date: Mon, 01 Feb 2021 04:45:36 +0100 [thread overview]
Message-ID: <20210201034536.TZA2PDwHurL1hrgSGSO00Hpe5jMhWIaUuWK_whnAgFI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28373@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 3077 bytes --]
From b63f0ed70cd686816834c7c4816ca585592ce252 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 1/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..d76499f5cd9
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From c7b528bedeefed4be2a8c4639c3bd707e98696ea Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 19:24:51 -0800
Subject: [PATCH 2/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index d76499f5cd9..e7c1bc28726 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,4 +1,6 @@
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+=======
+>>>>>>> 421b89460f (cargo: added patch for #28372)
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
From f1df337d0e9300bacf8a8d8ef21a6ccc456eb359 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 19:25:51 -0800
Subject: [PATCH 3/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index e7c1bc28726..d76499f5cd9 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,6 +1,4 @@
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
-=======
->>>>>>> 421b89460f (cargo: added patch for #28372)
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
next prev parent reply other threads:[~2021-02-01 3:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 1:52 [PR PATCH] " RossComputerGuy
2021-02-01 1:58 ` ericonr
2021-02-01 2:00 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 2:01 ` RossComputerGuy
2021-02-01 2:19 ` ericonr
2021-02-01 2:28 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 2:28 ` RossComputerGuy
2021-02-01 3:00 ` ericonr
2021-02-01 3:02 ` RossComputerGuy
2021-02-01 3:02 ` RossComputerGuy
2021-02-01 3:26 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 3:26 ` RossComputerGuy
2021-02-01 3:40 ` ericonr
2021-02-01 3:41 ` RossComputerGuy
2021-02-01 3:43 ` ericonr
2021-02-01 3:45 ` RossComputerGuy [this message]
2021-02-01 3:46 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 3:46 ` RossComputerGuy
2021-02-01 3:58 ` ericonr
2021-02-01 4:11 ` [PR PATCH] [Merged]: " ericonr
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=20210201034536.TZA2PDwHurL1hrgSGSO00Hpe5jMhWIaUuWK_whnAgFI@z \
--to=rosscomputerguy@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).