- Add 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=73
This commit is contained in:
parent
d3a299fd0e
commit
590105ca5b
25
0001-Make-JitCaptureStackTrace-match-its-declaration.patch
Normal file
25
0001-Make-JitCaptureStackTrace-match-its-declaration.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 6649495f011185948115f00ee7797277848f90e7 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 4 Jul 2022 11:02:15 +0200
|
||||
Subject: [PATCH] Make JitCaptureStackTrace match its declaration
|
||||
|
||||
---
|
||||
src/common/scripting/vm/vmframe.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/common/scripting/vm/vmframe.cpp b/src/common/scripting/vm/vmframe.cpp
|
||||
index 6cb03be43..476b945c2 100644
|
||||
--- a/src/common/scripting/vm/vmframe.cpp
|
||||
+++ b/src/common/scripting/vm/vmframe.cpp
|
||||
@@ -56,7 +56,7 @@ CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
|
||||
}
|
||||
#else
|
||||
CVAR(Bool, vm_jit, false, CVAR_NOINITCALL|CVAR_NOSET)
|
||||
-FString JitCaptureStackTrace(int framesToSkip, bool includeNativeFrames) { return FString(); }
|
||||
+FString JitCaptureStackTrace(int framesToSkip, bool includeNativeFrames, int maxFrames) { return FString(); }
|
||||
void JitRelease() {}
|
||||
#endif
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
@ -0,0 +1,26 @@
|
||||
From eb9bb8fb2fd0599199d8c94ece7e3bda642683ec Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 4 Jul 2022 10:52:17 +0200
|
||||
Subject: [PATCH] Revert "- use static_assert to make 32 bit builds fail."
|
||||
|
||||
This reverts commit 8c244f6f850eeb5a5dede7f887f3f1ba87b3d8bc.
|
||||
---
|
||||
src/common/engine/i_interface.cpp | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/common/engine/i_interface.cpp b/src/common/engine/i_interface.cpp
|
||||
index 13d35a3a9..217f9212f 100644
|
||||
--- a/src/common/engine/i_interface.cpp
|
||||
+++ b/src/common/engine/i_interface.cpp
|
||||
@@ -1,8 +1,6 @@
|
||||
#include "i_interface.h"
|
||||
#include "st_start.h"
|
||||
|
||||
-static_assert(sizeof(void*) == 8, "32 builds are not supported");
|
||||
-
|
||||
// Some global engine variables taken out of the backend code.
|
||||
FStartupScreen* StartWindow;
|
||||
SystemCallbacks sysCallbacks;
|
||||
--
|
||||
2.36.1
|
||||
|
@ -8,6 +8,7 @@ Sun Jun 26 13:02:04 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
reflections, while the latter makes the actor not cast
|
||||
reflections in mirrors.
|
||||
- Drop 0001-Resolve-build-failure-on-i686-linux.patch (merged)
|
||||
- Add 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 23 21:42:38 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
@ -33,6 +33,8 @@ Patch4: gzdoom-sdlbug.patch
|
||||
Patch5: gzdoom-vulkan.patch
|
||||
Patch6: gzdoom-discord.patch
|
||||
Patch8: 0001-Revert-load-the-hex-font-as-early-as-possible.patch
|
||||
Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch
|
||||
Patch10: 0001-Make-JitCaptureStackTrace-match-its-declaration.patch
|
||||
BuildRequires: cmake >= 2.8.7
|
||||
BuildRequires: discord-rpc-devel
|
||||
BuildRequires: gcc-c++
|
||||
|
Loading…
Reference in New Issue
Block a user