diff options
| author | B. Watson <yalhcru@gmail.com> | 2021-11-09 14:17:42 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-12-04 10:08:55 +0700 |
| commit | a1f71ad04906171ed5148b9fddd7b622f79eb096 (patch) | |
| tree | a45081375d45b7a22184a483edc5723aefe8ebc8 /games/qzdoom/compilefix.diff | |
| parent | c707e5a5677006278609afacdd9c41d579c79112 (diff) | |
| download | slackbuilds-a1f71ad04906171ed5148b9fddd7b622f79eb096.tar.gz | |
games/qzdoom: Fix -current build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games/qzdoom/compilefix.diff')
| -rw-r--r-- | games/qzdoom/compilefix.diff | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/games/qzdoom/compilefix.diff b/games/qzdoom/compilefix.diff new file mode 100644 index 0000000000..b156e873d3 --- /dev/null +++ b/games/qzdoom/compilefix.diff @@ -0,0 +1,34 @@ +diff -Naur qzdoom-q2.1.0/game-music-emu/CMakeLists.txt qzdoom-q2.1.0.patched/game-music-emu/CMakeLists.txt +--- qzdoom-q2.1.0/game-music-emu/CMakeLists.txt 2018-06-07 07:27:25.000000000 -0400 ++++ qzdoom-q2.1.0.patched/game-music-emu/CMakeLists.txt 2021-11-09 13:58:55.345649214 -0500 +@@ -89,7 +89,7 @@ + if (__LIBGME_TEST_VISIBILITY) + # get the gcc version + exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) +- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[1-9][0-9]*\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") + + # gcc <4.1 had poor support for symbol visibility + if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1")) +diff -Naur qzdoom-q2.1.0/src/scripting/types.cpp qzdoom-q2.1.0.patched/src/scripting/types.cpp +--- qzdoom-q2.1.0/src/scripting/types.cpp 2018-06-07 07:27:25.000000000 -0400 ++++ qzdoom-q2.1.0.patched/src/scripting/types.cpp 2021-11-09 14:13:57.493590140 -0500 +@@ -33,6 +33,7 @@ + ** + */ + ++#include <limits> + #include "vmintern.h" + #include "s_sound.h" + #include "dthinker.h" +diff -Naur qzdoom-q2.1.0/src/sound/oplsynth/OPL3.cpp qzdoom-q2.1.0.patched/src/sound/oplsynth/OPL3.cpp +--- qzdoom-q2.1.0/src/sound/oplsynth/OPL3.cpp 2018-06-07 07:27:25.000000000 -0400 ++++ qzdoom-q2.1.0.patched/src/sound/oplsynth/OPL3.cpp 2021-11-09 14:15:14.021585129 -0500 +@@ -43,6 +43,7 @@ + * + */ + ++#include <limits> + #include <math.h> + + #include "doomtype.h" |