Author: sls Date: Mon May 24 17:44:38 2010 GMT Module: packages Tag: HEAD ---- Log message: - added gcc44.patch and nostd_pipe2.patch
---- Files affected: packages/KoboDeluxe: KoboDeluxe.spec (1.13 -> 1.14) , gcc44.patch (NONE -> 1.1) (NEW), nostd_pipe2.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/KoboDeluxe/KoboDeluxe.spec diff -u packages/KoboDeluxe/KoboDeluxe.spec:1.13 packages/KoboDeluxe/KoboDeluxe.spec:1.14 --- packages/KoboDeluxe/KoboDeluxe.spec:1.13 Tue Feb 5 03:33:04 2008 +++ packages/KoboDeluxe/KoboDeluxe.spec Mon May 24 19:44:32 2010 @@ -11,6 +11,8 @@ Source0: http://olofson.net/kobodl/download/%{name}-%{version}.tar.bz2 # Source0-md5: cb5dcdaf07ccad18a921058138dedc4a Patch0: kobousr2var.patch +Patch1: gcc44.patch +Patch2: nostd_pipe2.patch URL: http://olofson.net/kobodl/ BuildRequires: SDL-devel >= 1.2 BuildRequires: SDL_image-devel >= 1.2 @@ -42,6 +44,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -77,6 +81,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2010/05/24 17:44:32 sls +- added gcc44.patch and nostd_pipe2.patch + Revision 1.13 2008/02/05 02:33:04 sls - rel. 1 ================================================================ Index: packages/KoboDeluxe/gcc44.patch diff -u /dev/null packages/KoboDeluxe/gcc44.patch:1.1 --- /dev/null Mon May 24 19:44:38 2010 +++ packages/KoboDeluxe/gcc44.patch Mon May 24 19:44:32 2010 @@ -0,0 +1,11 @@ +--- KoboDeluxe-0.5.1/graphics/window.cpp.orig 2010-05-24 18:48:48.024498000 +0200 ++++ KoboDeluxe-0.5.1/graphics/window.cpp 2010-05-24 18:48:58.684496628 +0200 +@@ -398,7 +398,7 @@ void window_t::center_token_fxp(int _x, + */ + if(token) + { +- char *tok = strchr(txt, token); ++ const char *tok = strchr(txt, token); + if(tok) + tokpos = tok-txt; + else ================================================================ Index: packages/KoboDeluxe/nostd_pipe2.patch diff -u /dev/null packages/KoboDeluxe/nostd_pipe2.patch:1.1 --- /dev/null Mon May 24 19:44:38 2010 +++ packages/KoboDeluxe/nostd_pipe2.patch Mon May 24 19:44:32 2010 @@ -0,0 +1,62 @@ +--- KoboDeluxe-0.5.1/enemies.h.orig 2010-05-24 18:53:21.647803692 +0200 ++++ KoboDeluxe-0.5.1/enemies.h 2010-05-24 18:54:37.847056344 +0200 +@@ -72,7 +72,7 @@ extern const enemy_kind bombdeto; + extern const enemy_kind cannon; + extern const enemy_kind pipe1; + extern const enemy_kind core; +-extern const enemy_kind pipe2; ++extern const enemy_kind kobo_pipe2; + extern const enemy_kind rock; + extern const enemy_kind ring; + extern const enemy_kind enemy_m1; +@@ -430,7 +430,7 @@ inline int _enemy::realize() + + inline int _enemy::is_pipe() + { +- return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); ++ return ((_state != notuse) && ((ek == &pipe1) || (ek == &kobo_pipe2))); + } + + +--- KoboDeluxe-0.5.1/enemy.cpp.orig 2010-05-24 19:04:08.577739047 +0200 ++++ KoboDeluxe-0.5.1/enemy.cpp 2010-05-24 19:04:48.070235366 +0200 +@@ -755,10 +755,10 @@ void _enemy::move_core() + + 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(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); + sound.g_base_core_explo(x, y); + release(); +@@ -978,19 +978,19 @@ void _enemy::move_pipe2() + } + p ^= a; + if(p & U_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); + if(p & R_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); + if(p & D_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + if(p & L_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); ++ enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); + manage.add_score(10); + release(); + } + + +-const enemy_kind pipe2 = { ++const enemy_kind kobo_pipe2 = { + 0, + &_enemy::make_pipe2, + &_enemy::move_pipe2, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/KoboDeluxe/KoboDeluxe.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
