Author: evgeni Date: 2012-05-01 17:43:01 +0000 (Tue, 01 May 2012) New Revision: 13526
Added: packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch Modified: packages/trunk/blocks-of-the-undead/debian/changelog packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch packages/trunk/blocks-of-the-undead/debian/patches/series Log: fix two ftbfs Modified: packages/trunk/blocks-of-the-undead/debian/changelog =================================================================== --- packages/trunk/blocks-of-the-undead/debian/changelog 2012-05-01 16:12:44 UTC (rev 13525) +++ packages/trunk/blocks-of-the-undead/debian/changelog 2012-05-01 17:43:01 UTC (rev 13526) @@ -1,3 +1,14 @@ +blocks-of-the-undead (1.0-5) unstable; urgency=low + + * Fix FTBFS with GCC 4.7 + Closes: #667119 + Thanks to Matthias Klose for spotting the issue and Cyril Brulebois + for providing the initial patch. + * Add patch from Ubuntu to fix FTBFS when CPPFLAGS contains more than + one value. + + -- Evgeni Golov <[email protected]> Tue, 01 May 2012 19:29:43 +0200 + blocks-of-the-undead (1.0-4) unstable; urgency=low [ Paul Wise ] Modified: packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch 2012-05-01 16:12:44 UTC (rev 13525) +++ packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch 2012-05-01 17:43:01 UTC (rev 13526) @@ -2,10 +2,15 @@ These can't accour that often and without a sleep we use way too much CPU. Forwarded: no Author: Evgeni Golov <[email protected]> -Last-Update: 2008-10-18 +Last-Update: 2012-05-01 --- BlocksOfTheUndead-1.0/TetrisAttack/src/CTetrisGame.cpp 2005-01-17 05:49:02.000000000 +0100 +++ BlocksOfTheUndead-1.0.patched/TetrisAttack/src/CTetrisGame.cpp 2008-10-18 21:17:42.000000000 +0200 +@@ -1,3 +1,4 @@ ++#include <unistd.h> + #include "tetris.h" + + CTetrisGame::CTetrisGame(int screenX, int screenY, int bitDepth, bool fullscreen, CTetrisTheme *theme, @@ -159,6 +159,7 @@ while (!done && SDL_PollEvent(&event)) { Added: packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch (rev 0) +++ packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch 2012-05-01 17:43:01 UTC (rev 13526) @@ -0,0 +1,14 @@ +Description: correct variable assignment to fix FTBFS +Author: Ilya Barygin <[email protected]> + +--- blocks-of-the-undead-1.0.orig/configure ++++ blocks-of-the-undead-1.0/configure +@@ -3860,7 +3860,7 @@ + if test "x$no_sdl" = x ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- CPPFLAGS=$SDL_CFLAGS $CPPFLAGS ++ CPPFLAGS="$SDL_CFLAGS $CPPFLAGS" + LIBS=$SDL_LIBS $LIBS + else + echo "$as_me:$LINENO: result: no" >&5 Modified: packages/trunk/blocks-of-the-undead/debian/patches/series =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/series 2012-05-01 16:12:44 UTC (rev 13525) +++ packages/trunk/blocks-of-the-undead/debian/patches/series 2012-05-01 17:43:01 UTC (rev 13526) @@ -1,3 +1,4 @@ 01-sleep_a_bit.patch 02_accept_mousepress_as_anykey.patch 03_dont_fail_if_no_sound_available.patch +04_configure_vars.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
