summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2021-08-24 12:02:57 +0200
committer Willy Sudiarto Raharjo2021-08-25 07:11:45 +0200
commit3fc292e19cd894c1e547c4782dd74d2b59e45913 (patch)
tree6394857f400bb7fb0d6f733babf6dbaf5cc7f94c
parentd7eb36459e6e26138a6620e1bfaa55892d82de93 (diff)
downloadslackbuilds-3fc292e19cd894c1e547c4782dd74d2b59e45913.tar.gz
games/0ad: Updated for version 0.0.25.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/0ad/0ad.SlackBuild6
-rw-r--r--games/0ad/0ad.info4
-rw-r--r--games/0ad/rust-1.50.0.patch40
3 files changed, 4 insertions, 46 deletions
diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild
index 4b4544340e..7ebbab8d82 100644
--- a/games/0ad/0ad.SlackBuild
+++ b/games/0ad/0ad.SlackBuild
@@ -27,9 +27,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=0ad
-VERSION=${VERSION:-0.0.24b}
+VERSION=${VERSION:-0.0.25}
RELEASE=${RELEASE:-alpha}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -103,8 +103,6 @@ sed -i '/ps\/Profiler2/a #include <stack>' source/ps/Profiler2GPU.cpp || exit 1
# have a root check, let's disable it.
patch -p1 < $CWD/disable-root-check.patch
-echo "patch -p1 < $CWD/rust-1.50.0.patch" >> libraries/source/spidermonkey/patch.sh
-
build/workspaces/update-workspaces.sh \
--without-pch \
--bindir=/usr/games \
diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info
index ec46e6bed0..29ba3a3751 100644
--- a/games/0ad/0ad.info
+++ b/games/0ad/0ad.info
@@ -1,8 +1,8 @@
PRGNAM="0ad"
VERSION="0.0.24b"
HOMEPAGE="https://play0ad.com/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-build.tar.xz"
-MD5SUM="c9d34029fe95d515a5284508cc1d646c"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.25-alpha-unix-build.tar.xz"
+MD5SUM="bb12aeb3276bdce614bd47a268058f31"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="0ad-data enet fmt gloox miniupnpc"
diff --git a/games/0ad/rust-1.50.0.patch b/games/0ad/rust-1.50.0.patch
deleted file mode 100644
index 1652884065..0000000000
--- a/games/0ad/rust-1.50.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur mozjs-78.6.0.orig/.cargo/config.in mozjs-78.6.0/.cargo/config.in
---- mozjs-78.6.0.orig/.cargo/config.in 2020-11-28 17:33:01.000000000 +0100
-+++ mozjs-78.6.0/.cargo/config.in 2021-02-26 08:45:50.995837000 +0100
-@@ -3,9 +3,9 @@
- # Please do not edit.
-
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
-diff -Naur mozjs-78.6.0.orig/Cargo.lock mozjs-78.6.0/Cargo.lock
---- mozjs-78.6.0.orig/Cargo.lock 2020-11-28 17:33:01.000000000 +0100
-+++ mozjs-78.6.0/Cargo.lock 2021-02-26 08:47:06.265837000 +0100
-@@ -3200,7 +3200,7 @@
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
- "bitflags",
- "cc",
-diff -Naur mozjs-78.6.0.orig/Cargo.toml mozjs-78.6.0/Cargo.toml
---- mozjs-78.6.0.orig/Cargo.toml 2020-11-28 17:34:26.000000000 +0100
-+++ mozjs-78.6.0/Cargo.toml 2021-02-26 08:48:06.663837000 +0100
-@@ -60,8 +60,8 @@
- [patch.crates-io]
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }