From 8bc60c926055148691287395092e264b9056ac37 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 9 Nov 2016 07:16:13 +0100 Subject: [PATCH] do not check minor version of mozjs Signed-off-by: Igor Gnatenko --- 0ad-mozjs-no-minor-check.patch | 23 +++++++++++++++++++++++ 0ad.spec | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 0ad-mozjs-no-minor-check.patch diff --git a/0ad-mozjs-no-minor-check.patch b/0ad-mozjs-no-minor-check.patch new file mode 100644 index 0000000..114ac78 --- /dev/null +++ b/0ad-mozjs-no-minor-check.patch @@ -0,0 +1,23 @@ +diff -uNr 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 0ad-0.0.21-alpha/source/scriptinterface/ScriptTypes.h +--- 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 2016-09-02 18:19:31.000000000 +0200 ++++ 0ad-0.0.21-alpha/source/scriptinterface/ScriptTypes.h 2016-11-09 07:14:16.227277422 +0100 +@@ -79,19 +79,6 @@ + include paths. + #endif + +-#if MOZJS_MINOR_VERSION != 3 +-#error Your compiler is trying to use an untested minor version of the \ +-SpiderMonkey library. If you are a package maintainer, please make sure \ +-to check very carefully that this version does not change the behaviour \ +-of the code executed by SpiderMonkey. Different parts of the game (e.g. \ +-the multiplayer mode) rely on deterministic behaviour of the JavaScript \ +-engine. A simple way for testing this would be playing a network game \ +-with one player using the old version and one player using the new \ +-version. Another way for testing is running replays and comparing the \ +-final hash (check trac.wildfiregames.com/wiki/Debugging#Replaymode). \ +-For more information check this link: trac.wildfiregames.com/wiki/Debugging#Outofsync +-#endif +- + class ScriptInterface; + + #endif // INCLUDED_SCRIPTTYPES diff --git a/0ad.spec b/0ad.spec index c407d38..f19fcfa 100644 --- a/0ad.spec +++ b/0ad.spec @@ -106,6 +106,9 @@ Patch1: %{name}-debug.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1141464 Patch3: %{name}-valgrind.patch +# We have don't want to ensure that we have 38.3.x of mozjs (we just don't have it) +Patch4: %{name}-mozjs-no-minor-check.patch + %description 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform real-time strategy (RTS) game of ancient warfare. In short, it is a @@ -127,6 +130,7 @@ hobbyist game developers, since 2001. %patch1 -p0 %endif %patch3 -p0 +%patch4 -p1 %if %{with system_nvtt} rm -fr libraries/source/nvtt