diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2021-06-19 23:54:03 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2021-06-20 08:40:32 -0400 |
| commit | 7c1b085717d43e46f03499d4e8330756000a8573 (patch) | |
| tree | 53d153674a72f7052ca2bb173f1607723540414c /games-action/shootingstar/files | |
| parent | games-action/heroes: fix RequiredUseDefaults, tighten sdl deps (diff) | |
| download | gentoo-7c1b085717d43e46f03499d4e8330756000a8573.tar.gz gentoo-7c1b085717d43e46f03499d4e8330756000a8573.tar.bz2 gentoo-7c1b085717d43e46f03499d4e8330756000a8573.zip | |
games-action/shootingstar: fix segfault, tighten sdl deps, and tidy
Combined patches (with added bugrefs) not to have multiple 1 line
simple patches that will likely never be removed.
Closes: https://bugs.gentoo.org/607428
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'games-action/shootingstar/files')
3 files changed, 29 insertions, 33 deletions
diff --git a/games-action/shootingstar/files/1.2.0-gcc34.patch b/games-action/shootingstar/files/1.2.0-gcc34.patch deleted file mode 100644 index b55997552fc8..000000000000 --- a/games-action/shootingstar/files/1.2.0-gcc34.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur shootingstar-1.2.0/src/engine/cTextureFont.cpp shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp ---- shootingstar-1.2.0/src/engine/cTextureFont.cpp 2003-07-06 19:31:10.000000000 +0100 -+++ shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp 2004-07-26 20:51:16.992768063 +0100 -@@ -31,6 +31,7 @@ - #include <stdio.h> - #include <GL/gl.h> - #include <GL/glu.h> -+#include <math.h> - #include "cTextureManager.hpp" - #include "Debug.hpp" - //------------------------------------------------------------------------------ -diff -ur shootingstar-1.2.0/src/game/cOptions.cpp shootingstar-1.2.0.loz/src/game/cOptions.cpp ---- shootingstar-1.2.0/src/game/cOptions.cpp 2003-12-22 05:09:06.000000000 +0000 -+++ shootingstar-1.2.0.loz/src/game/cOptions.cpp 2004-07-26 21:00:25.265284270 +0100 -@@ -201,7 +201,7 @@ - dbgError () << "Unable to read from options file\n"; - throw runtime_error ("Unable to load options"); - } -- int (keys.keys[i]) = key; // IS THIS SAFE? -+ keys.keys[i] = (SDLKey)key; // IS THIS SAFE? - - fin >> key; - keys.buttons[i] = key; diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch b/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch new file mode 100644 index 000000000000..48304070d5c8 --- /dev/null +++ b/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/58287 (math.h/SDLKey for gcc 3.4) +https://bugs.gentoo.org/272374 (cstdio for gcc 4.4) +https://bugs.gentoo.org/607428 (signed int for segfault) +--- a/src/engine/cTextureFont.cpp ++++ b/src/engine/cTextureFont.cpp +@@ -33,2 +33,3 @@ + #include <GL/glu.h> ++#include <math.h> + #include "cTextureManager.hpp" +--- a/src/engine/dbg.cpp ++++ b/src/engine/dbg.cpp +@@ -26,2 +26,3 @@ + #include <cstdlib> ++#include <cstdio> + #include <string> +--- a/src/game/cMainMenu.cpp ++++ b/src/game/cMainMenu.cpp +@@ -401,3 +401,3 @@ + +- static unsigned int i = 0; ++ static int i = 0; + if ( mLastLetter + 100 < now ) +--- a/src/game/cOptions.cpp ++++ b/src/game/cOptions.cpp +@@ -203,3 +203,3 @@ + } +- int (keys.keys[i]) = key; // IS THIS SAFE? ++ keys.keys[i] = (SDLKey)key; + diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch b/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch deleted file mode 100644 index dfc1a8d8e77e..000000000000 --- a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/engine/dbg.cpp 2009-06-03 15:15:46.000000000 +0200 -+++ b/src/engine/dbg.cpp 2009-06-03 16:09:19.000000000 +0200 -@@ -28,6 +28,7 @@ - #include <vector> - #include <map> - #include <algorithm> -+#include <cstdio> - - /********************************************************************** - * Implementation notes |