summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-01-13 01:01:10 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-01-13 01:01:10 +0000
commitedc5b9d1fe97bb2c86d85b5a522336b69351bdc3 (patch)
tree5261e890ffb74a678d7cd888fcb3417f4725fb97 /games-arcade/kobodeluxe/files
parentVersion bump, bug #254594, ebuild improved by Gautam Iyer. (diff)
downloadgentoo-2-edc5b9d1fe97bb2c86d85b5a522336b69351bdc3.tar.gz
gentoo-2-edc5b9d1fe97bb2c86d85b5a522336b69351bdc3.tar.bz2
gentoo-2-edc5b9d1fe97bb2c86d85b5a522336b69351bdc3.zip
add patch to build with glibc29 from Martin Väth via bug #251121
(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
Diffstat (limited to 'games-arcade/kobodeluxe/files')
-rw-r--r--games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch11
-rw-r--r--games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch83
2 files changed, 83 insertions, 11 deletions
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch
deleted file mode 100644
index c41e30dfe3b5..000000000000
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- KoboDeluxe-0.4pre10/gamestate.h.orig 2006-03-19 16:06:44.000000000 +0100
-+++ KoboDeluxe-0.4pre10/gamestate.h 2006-03-19 16:06:50.000000000 +0100
-@@ -24,6 +24,8 @@
-
- #include "window.h"
-
-+class gamestatemanager_t;
-+
- class gamestate_t
- {
- friend class gamestatemanager_t;
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
new file mode 100644
index 000000000000..98451bb29975
--- /dev/null
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
@@ -0,0 +1,83 @@
+--- enemies.h
++++ 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)));
+ }
+
+
+--- enemy.cpp
++++ 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,