| 1 |
commit: c81340cc391e38351a98c95f89ada39447c621fb |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 1 10:39:33 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 1 10:56:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81340cc |
| 7 |
|
| 8 |
games-strategy/0ad: fix build with >=virtual/rust-1.50 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/773493 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 3 +- |
| 14 |
.../0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch | 82 ++++++++++++++++++++++ |
| 15 |
2 files changed, 84 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild |
| 18 |
index a36405f4744..2e003b33f53 100644 |
| 19 |
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild |
| 20 |
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild |
| 21 |
@@ -74,7 +74,8 @@ RDEPEND=" |
| 22 |
" |
| 23 |
|
| 24 |
PATCHES=( |
| 25 |
- "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch" |
| 26 |
+ "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch |
| 27 |
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch |
| 28 |
) |
| 29 |
|
| 30 |
pkg_setup() { |
| 31 |
|
| 32 |
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..f4436a7b92c |
| 35 |
--- /dev/null |
| 36 |
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch |
| 37 |
@@ -0,0 +1,82 @@ |
| 38 |
+https://bugs.gentoo.org/773493 |
| 39 |
+--- a/libraries/source/spidermonkey/FixRust150.diff |
| 40 |
++++ b/libraries/source/spidermonkey/FixRust150.diff |
| 41 |
+@@ -0,0 +1,65 @@ |
| 42 |
++ |
| 43 |
++# HG changeset patch |
| 44 |
++# User Emilio Cobos Álvarez <emilio@××××××.io> |
| 45 |
++# Date 1609006565 0 |
| 46 |
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582 |
| 47 |
++# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0 |
| 48 |
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM |
| 49 |
++ |
| 50 |
++Fixes errors like: |
| 51 |
++ |
| 52 |
++ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. |
| 53 |
++ |
| 54 |
++I've left the most specific dependency, but for wgpu the rev is not |
| 55 |
++right, so I've kept the branch which effectively preserves behavior. |
| 56 |
++ |
| 57 |
++Differential Revision: https://phabricator.services.mozilla.com/D100485 |
| 58 |
++ |
| 59 |
++diff --git a/.cargo/config.in b/.cargo/config.in |
| 60 |
++--- a/.cargo/config.in |
| 61 |
+++++ b/.cargo/config.in |
| 62 |
++@@ -1,16 +1,16 @@ |
| 63 |
++ # This file contains vendoring instructions for cargo. |
| 64 |
++ # It was generated by `mach vendor rust`. |
| 65 |
++ # Please do not edit. |
| 66 |
++ |
| 67 |
++ [source."https://github.com/shravanrn/nix/"] |
| 68 |
++-branch = "r0.13.1" |
| 69 |
++ git = "https://github.com/shravanrn/nix/" |
| 70 |
++ replace-with = "vendored-sources" |
| 71 |
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" |
| 72 |
++ |
| 73 |
++ [source."https://github.com/mozilla/rkv"] |
| 74 |
++ git = "https://github.com/mozilla/rkv" |
| 75 |
++ replace-with = "vendored-sources" |
| 76 |
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731" |
| 77 |
++ |
| 78 |
++ [source."https://github.com/mozilla/neqo"] |
| 79 |
++ git = "https://github.com/mozilla/neqo" |
| 80 |
++diff --git a/Cargo.lock b/Cargo.lock |
| 81 |
++--- a/Cargo.lock |
| 82 |
+++++ b/Cargo.lock |
| 83 |
++@@ -3200,7 +3200,7 @@ |
| 84 |
++ [[package]] |
| 85 |
++ name = "nix" |
| 86 |
++ version = "0.13.1" |
| 87 |
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" |
| 88 |
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" |
| 89 |
++ dependencies = [ |
| 90 |
++ "bitflags", |
| 91 |
++ "cc", |
| 92 |
++diff --git a/Cargo.toml b/Cargo.toml |
| 93 |
++--- a/Cargo.toml |
| 94 |
+++++ b/Cargo.toml |
| 95 |
++@@ -60,8 +60,8 @@ |
| 96 |
++ [patch.crates-io] |
| 97 |
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } |
| 98 |
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } |
| 99 |
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } |
| 100 |
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } |
| 101 |
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } |
| 102 |
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } |
| 103 |
++ # failure's backtrace feature might break our builds, see bug 1608157. |
| 104 |
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } |
| 105 |
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } |
| 106 |
++ |
| 107 |
+--- a/libraries/source/spidermonkey/patch.sh |
| 108 |
++++ b/libraries/source/spidermonkey/patch.sh |
| 109 |
+@@ -39,6 +39,10 @@ |
| 110 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 |
| 111 |
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff |
| 112 |
+ |
| 113 |
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb |
| 114 |
++# Note that this isn't quite the upstream patch to match our version. |
| 115 |
++patch -p1 < ../FixRust150.diff |
| 116 |
++ |
| 117 |
+ # Patch those separately, as they might interfere with normal behaviour. |
| 118 |
+ if [ "$(uname -s)" = "FreeBSD" ]; |
| 119 |
+ then |
Archives