diff --git a/0ad-0.0.24b-alpha-unix-build.tar.xz b/0ad-0.0.24b-alpha-unix-build.tar.xz deleted file mode 100644 index 66c0aa7..0000000 --- a/0ad-0.0.24b-alpha-unix-build.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8 -size 75546740 diff --git a/0ad-0.0.25-alpha-unix-build.tar.xz b/0ad-0.0.25-alpha-unix-build.tar.xz new file mode 100644 index 0000000..6d263f5 --- /dev/null +++ b/0ad-0.0.25-alpha-unix-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f +size 75788348 diff --git a/0ad.changes b/0ad.changes index 92d83e1..468eb71 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 16 20:42:52 UTC 2021 - Simon Puchert + +- Update to version 0.0.25: + * See https://play0ad.com/new-release-0-a-d-alpha-25-yauna/ +- Dropped mozjs-rust_1_50.patch, merged upstream + ------------------------------------------------------------------- Tue Apr 27 09:51:16 UTC 2021 - Guillaume GARDET diff --git a/0ad.spec b/0ad.spec index 2880e00..6573fe2 100644 --- a/0ad.spec +++ b/0ad.spec @@ -30,7 +30,7 @@ # Use provided library %bcond_without system_nvtt Name: 0ad -Version: 0.0.24b +Version: 0.0.25 Release: 0 Summary: A real-time strategy game of ancient warfare License: GPL-2.0-or-later AND LGPL-3.0-or-later AND CC-BY-SA-3.0 AND MIT AND ISC AND MPL-2.0 AND BSD-3-Clause @@ -39,8 +39,6 @@ URL: https://play0ad.com/ Source: https://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.tar.xz # PATCH-FIX-UPSTREAM Patch0: avoid_duplicate_global_symbol_from_asm.patch -# PATCH-FIX-UPSTREAM mozjs-rust_1_50.patch -- https://code.wildfiregames.com/D3590 -Patch1: mozjs-rust_1_50.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libXcursor-devel @@ -91,7 +89,6 @@ flexible game engine. %prep %setup -q -n %{name}-%{version}-alpha %patch0 -p1 -%patch1 -p1 %build export CFLAGS="%{optflags}" diff --git a/mozjs-rust_1_50.patch b/mozjs-rust_1_50.patch deleted file mode 100644 index ced3d76..0000000 --- a/mozjs-rust_1_50.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Nur 0ad-0.0.24b-alpha/libraries/source/spidermonkey/build.sh new/libraries/source/spidermonkey/build.sh ---- 0ad-0.0.24b-alpha/libraries/source/spidermonkey/build.sh 2021-02-06 01:28:31.000000000 +0100 -+++ new/libraries/source/spidermonkey/build.sh 2021-04-02 04:25:01.998648215 +0200 -@@ -33,7 +33,10 @@ - - # Standalone SpiderMonkey can not use jemalloc (see https://bugzilla.mozilla.org/show_bug.cgi?id=1465038) - # Jitspew doesn't compile on VS17 in the zydis disassembler - since we don't use it, deactivate it. --CONF_OPTS="--disable-tests -+CONF_OPTS="--enable-lto -+ --disable-crashreporter -+ --disable-tests -+ --disable-strip - --disable-jemalloc - --disable-js-shell - --without-intl-api -diff -Nur 0ad-0.0.24b-alpha/libraries/source/spidermonkey/FixRust150.diff new/libraries/source/spidermonkey/FixRust150.diff ---- 0ad-0.0.24b-alpha/libraries/source/spidermonkey/FixRust150.diff 1970-01-01 01:00:00.000000000 +0100 -+++ new/libraries/source/spidermonkey/FixRust150.diff 2021-04-02 04:24:29.626357684 +0200 -@@ -0,0 +1,65 @@ -+ -+# HG changeset patch -+# User Emilio Cobos Álvarez -+# Date 1609006565 0 -+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582 -+# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0 -+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM -+ -+Fixes errors like: -+ -+ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. -+ -+I've left the most specific dependency, but for wgpu the rev is not -+right, so I've kept the branch which effectively preserves behavior. -+ -+Differential Revision: https://phabricator.services.mozilla.com/D100485 -+ -+diff --git a/.cargo/config.in b/.cargo/config.in -+--- a/.cargo/config.in -++++ b/.cargo/config.in -+@@ -1,16 +1,16 @@ -+ # This file contains vendoring instructions for cargo. -+ # It was generated by `mach vendor rust`. -+ # 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" -+ replace-with = "vendored-sources" -+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731" -+ -+ [source."https://github.com/mozilla/neqo"] -+ git = "https://github.com/mozilla/neqo" -+diff --git a/Cargo.lock b/Cargo.lock -+--- a/Cargo.lock -++++ b/Cargo.lock -+@@ -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 --git a/Cargo.toml b/Cargo.toml -+--- a/Cargo.toml -++++ b/Cargo.toml -+@@ -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 = "wgpu3" } -+ # 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" } -+ -diff -Nur 0ad-0.0.24b-alpha/libraries/source/spidermonkey/patch.sh new/libraries/source/spidermonkey/patch.sh ---- 0ad-0.0.24b-alpha/libraries/source/spidermonkey/patch.sh 2021-02-06 01:28:31.000000000 +0100 -+++ new/libraries/source/spidermonkey/patch.sh 2021-04-02 04:24:29.626357684 +0200 -@@ -39,6 +39,10 @@ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 - patch -p1 < ../FixRpiUnalignedFpAccess.diff - -+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb -+# Note that this isn't quite the upstream patch to match our version. -+patch -p1 < ../FixRust150.diff -+ - # Patch those separately, as they might interfere with normal behaviour. - if [ "$(uname -s)" = "FreeBSD" ]; - then