forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gnome-base/librsvg: backport time crate update to 2.57.3, 2.58.2
Backport the changes from 5c3fde3 so that people don't need 3 Rust slots installed. Signed-off-by: Sam James <[email protected]>
- Loading branch information
1 parent
dc15bd2
commit 61a8461
Showing
4 changed files
with
59 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| Needed for compat w/ >=rust-1.80. The time crate is only used for tests. | ||
| --- a/Cargo.lock | ||
| +++ b/Cargo.lock | ||
| @@ -1217,6 +1217,12 @@ dependencies = [ | ||
| "num-traits", | ||
| ] | ||
|
|
||
| +[[package]] | ||
| +name = "num-conv" | ||
| +version = "0.1.0" | ||
| +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" | ||
| + | ||
| [[package]] | ||
| name = "num-integer" | ||
| version = "0.1.45" | ||
| @@ -2109,12 +2115,13 @@ dependencies = [ | ||
|
|
||
| [[package]] | ||
| name = "time" | ||
| -version = "0.3.30" | ||
| +version = "0.3.36" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" | ||
| +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" | ||
| dependencies = [ | ||
| "deranged", | ||
| "itoa", | ||
| + "num-conv", | ||
| "powerfmt", | ||
| "serde", | ||
| "time-core", | ||
| @@ -2129,10 +2136,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" | ||
|
|
||
| [[package]] | ||
| name = "time-macros" | ||
| -version = "0.2.15" | ||
| +version = "0.2.18" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" | ||
| +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" | ||
| dependencies = [ | ||
| + "num-conv", | ||
| "time-core", | ||
| ] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -131,6 +131,7 @@ CRATES=" | |
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
|
|
@@ -220,8 +221,8 @@ CRATES=" | |
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
| [email protected].15 | ||
| [email protected].30 | ||
| [email protected].18 | ||
| [email protected].36 | ||
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
|
|
@@ -277,7 +278,6 @@ CRATES=" | |
| [email protected] | ||
| " | ||
|
|
||
| RUST_MAX_VER="1.79.0" | ||
| RUST_USEDEP='${MULTILIB_USEDEP}' | ||
|
|
||
| inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala | ||
|
|
@@ -327,6 +327,10 @@ BDEPEND=" | |
| " | ||
| # dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf | ||
|
|
||
| PATCHES=( | ||
| "${FILESDIR}"/librsvg-2.57.3-time-rust-1.80.patch | ||
| ) | ||
|
|
||
| QA_FLAGS_IGNORED=" | ||
| usr/bin/rsvg-convert | ||
| usr/lib.*/librsvg.* | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -230,8 +230,8 @@ CRATES=" | |
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
| [email protected].17 | ||
| [email protected].34 | ||
| [email protected].18 | ||
| [email protected].36 | ||
| [email protected] | ||
| [email protected] | ||
| [email protected] | ||
|
|
@@ -288,7 +288,6 @@ CRATES=" | |
| [email protected] | ||
| " | ||
|
|
||
| RUST_MAX_VER="1.79.0" | ||
| RUST_MIN_VER="1.71.1" | ||
| RUST_USEDEP='${MULTILIB_USEDEP}' | ||
|
|
||
|
|
@@ -344,6 +343,10 @@ QA_FLAGS_IGNORED=" | |
| usr/lib.*/librsvg.* | ||
| " | ||
|
|
||
| PATCHES=( | ||
| "${FILESDIR}"/librsvg-2.58.5-time-rust-1.80.patch | ||
| ) | ||
|
|
||
| pkg_setup() { | ||
| rust_pkg_setup | ||
| python-any-r1_pkg_setup | ||
|
|
||