Author: pdewacht-guest Date: 2011-05-08 19:49:20 +0000 (Sun, 08 May 2011) New Revision: 12240
Added: packages/trunk/adonthell/debian/patches/11_ftbfs_with_gcc-4.6.diff Modified: packages/trunk/adonthell/debian/changelog packages/trunk/adonthell/debian/patches/series Log: adonthell: fix ftbfs (#624998) Modified: packages/trunk/adonthell/debian/changelog =================================================================== --- packages/trunk/adonthell/debian/changelog 2011-05-08 19:05:43 UTC (rev 12239) +++ packages/trunk/adonthell/debian/changelog 2011-05-08 19:49:20 UTC (rev 12240) @@ -1,9 +1,14 @@ adonthell (0.3.5-6) UNRELEASED; urgency=low + [ Iain Lane ] * debian/control: Remove myself from Uploaders - -- Iain Lane <[email protected]> Wed, 30 Jun 2010 10:53:46 +0100 + [ Peter De Wachter ] + * Fixed FTBFS with newer gcc. (Closes: #624998) + - Added patch: 11_ftbfs_with_gcc-4.6.diff + -- Peter De Wachter <[email protected]> Sun, 08 May 2011 21:47:10 +0200 + adonthell (0.3.5-5) unstable; urgency=low * Drop support for armel for now (Closes: #562904) Added: packages/trunk/adonthell/debian/patches/11_ftbfs_with_gcc-4.6.diff =================================================================== --- packages/trunk/adonthell/debian/patches/11_ftbfs_with_gcc-4.6.diff (rev 0) +++ packages/trunk/adonthell/debian/patches/11_ftbfs_with_gcc-4.6.diff 2011-05-08 19:49:20 UTC (rev 12240) @@ -0,0 +1,40 @@ +Description: fix "taking address of temporary" errors +Author: Peter De Wachter <[email protected]> +Bug-Debian: http://bugs.debian.org/624998 +Forwarded: not-needed? + +It looks like the relevant code has been entirely rewritten for adonthell 0.4 + +--- a/src/label.cc ++++ b/src/label.cc +@@ -645,7 +645,7 @@ + } + + +-const string label::text_string () const ++const string & label::text_string () const + { + return my_text_; + } +--- a/src/label.h ++++ b/src/label.h +@@ -90,7 +90,7 @@ + /** + Get the text in string + */ +- const string text_string () const; ++ const string & text_string () const; + + + /** +--- a/src/win_event.cc ++++ b/src/win_event.cc +@@ -35,7 +35,7 @@ + case DESTROY: + { + set_callback_destroy ( +- makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret)); ++ makeFunctor (new Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret)); + break; + } + Modified: packages/trunk/adonthell/debian/patches/series =================================================================== --- packages/trunk/adonthell/debian/patches/series 2011-05-08 19:05:43 UTC (rev 12239) +++ packages/trunk/adonthell/debian/patches/series 2011-05-08 19:49:20 UTC (rev 12240) @@ -1,2 +1,3 @@ 04_do_not_ship_pyc.diff 10_ftbfs_with_gcc-4.4.diff +11_ftbfs_with_gcc-4.6.diff _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
