From 55a5024790eec35949eefb6cbafa04a3126a04d9554c7369cbad24b5f5351f61 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 5 Jul 2022 00:29:57 +0000 Subject: [PATCH] - Update to release 4.8.2 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=76 --- ...tureStackTrace-match-its-declaration.patch | 25 ------------------- g4.8.1.tar.gz | 3 --- g4.8.2.tar.gz | 3 +++ gzdoom.changes | 6 +++++ gzdoom.spec | 3 +-- 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 0001-Make-JitCaptureStackTrace-match-its-declaration.patch delete mode 100644 g4.8.1.tar.gz create mode 100644 g4.8.2.tar.gz diff --git a/0001-Make-JitCaptureStackTrace-match-its-declaration.patch b/0001-Make-JitCaptureStackTrace-match-its-declaration.patch deleted file mode 100644 index 3c5a566..0000000 --- a/0001-Make-JitCaptureStackTrace-match-its-declaration.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6649495f011185948115f00ee7797277848f90e7 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 - diff --git a/g4.8.1.tar.gz b/g4.8.1.tar.gz deleted file mode 100644 index 275e064..0000000 --- a/g4.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b48ed09e88200a29472fcaa2591d40ef783f4c66b2e3bee903d9799c5ea238d -size 24246900 diff --git a/g4.8.2.tar.gz b/g4.8.2.tar.gz new file mode 100644 index 0000000..ea05dd3 --- /dev/null +++ b/g4.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4edd60f8094c9dc3dfb7400bdbc0ebb0a5e574b0a6747eee4c8d9f1f6af77127 +size 24247668 diff --git a/gzdoom.changes b/gzdoom.changes index 170c997..15fcfb5 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 5 00:26:11 UTC 2022 - Jan Engelhardt + +- Update to release 4.8.2 + * add a few maps to the rebuildnodes compatibility block + ------------------------------------------------------------------- Sun Jun 26 13:02:04 UTC 2022 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index eb0aa9b..9899456 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.8.1 +Version: 4.8.2 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -34,7 +34,6 @@ 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++