b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

kobodeluxe: fix compilation errors.

Browse source 
The glibc29 patch was taken from Gentoo.
This commit is contained in:
Carles Pagès 2012-07-12 23:42:20 +02:00
parent 8fd57ff21e
commit 0b85d04d9e
2 changed files with 89 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/games/kobodeluxe/default.nix
View file

@ -9,6 +9,12 @@ stdenv.mkDerivation {
buildInputs = [ SDL SDL_image];
prePatch = ''
sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp
'';
patches = [ ./glibc29.patch ];
meta = {
homepage = http://olofson.net/kobodl/;
description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11";

83
pkgs/games/kobodeluxe/glibc29.patch Normal file
View file

@ -0,0 +1,83 @@
--- a/enemies.h
+++ b/enemies.h
@@ -70,9 +70,9 @@
extern const enemy_kind bomb2;
extern const enemy_kind bombdeto;
extern const enemy_kind cannon;
-extern const enemy_kind pipe1;
+extern const enemy_kind pipeone;
extern const enemy_kind core;
-extern const enemy_kind pipe2;
+extern const enemy_kind pipetwo;
extern const enemy_kind rock;
extern const enemy_kind ring;
extern const enemy_kind enemy_m1;
@@ -430,7 +430,7 @@
inline int _enemy::is_pipe()
{
- return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
+ return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo)));
}
--- a/enemy.cpp
+++ b/enemy.cpp
@@ -713,7 +713,7 @@
void _enemy::kill_cannon()
{
- enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
+ enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y));
sound.g_base_node_explo(x, y);
release();
}
@@ -755,10 +755,10 @@
void _enemy::kill_core()
{
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
sound.g_base_core_explo(x, y);
release();
@@ -851,7 +851,7 @@
screen.set_map(x1, y1, m ^ a);
release();
}
-const enemy_kind pipe1 = {
+const enemy_kind pipeone = {
0,
&_enemy::make_pipe1,
&_enemy::move_pipe1,
@@ -978,19 +978,19 @@
}
p ^= a;
if(p & U_MASK)
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
if(p & R_MASK)
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
if(p & D_MASK)
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
if(p & L_MASK)
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
manage.add_score(10);
release();
}
-const enemy_kind pipe2 = {
+const enemy_kind pipetwo = {
0,
&_enemy::make_pipe2,
&_enemy::move_pipe2,