Author: kibi-guest Date: 2008-02-28 23:17:27 +0000 (Thu, 28 Feb 2008) New Revision: 5934
Added: packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch Removed: packages/trunk/vodovod/debian/patches/hiscore_includes.patch Modified: packages/trunk/vodovod/debian/changelog packages/trunk/vodovod/debian/patches/series Log: Merge Barry's initial patch into mine, to fix FTBFS with gcc-4.3 (Closes: #455114). Modified: packages/trunk/vodovod/debian/changelog =================================================================== --- packages/trunk/vodovod/debian/changelog 2008-02-28 23:09:06 UTC (rev 5933) +++ packages/trunk/vodovod/debian/changelog 2008-02-28 23:17:27 UTC (rev 5934) @@ -14,10 +14,12 @@ [ Cyril Brulebois ] * Add Vcs-Svn and Vcs-Browser fields in the control file. * Remove Marco Rodrigues from the Uploaders field. + * Fix FTBFS with gcc-4.3 (Closes: #455114) by adding the following + patch: + + fix-FTBFS-with-gcc-4.3.patch. [ Barry deFreese ] * Re-fix the watch file. - * hiscore_includes.patch (Closes: #455114). * Make clean not ignore errors. * Remove deprecated encoding from desktop file and path from exec. * Bump Standards-Version to 3.7.3. Added: packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch =================================================================== --- packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch (rev 0) +++ packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch 2008-02-28 23:17:27 UTC (rev 5934) @@ -0,0 +1,21 @@ +--- a/hiscore.cpp ++++ b/hiscore.cpp +@@ -21,6 +21,8 @@ + #include <stdlib.h> + #include <sys/stat.h> + #include "hiscore.h" ++#include <climits> ++#include <cstring> + //----------------------------------------------------------------------------- + HiScores &hiScores() + { +--- a/config.cpp ++++ b/config.cpp +@@ -25,6 +25,7 @@ + #include <stdio.h> + #include <sys/stat.h> + #include "config.h" ++#include <climits> + //------------------------------------------------------------------------------ + using namespace std; + //----------------------------------------------------------------------------- Deleted: packages/trunk/vodovod/debian/patches/hiscore_includes.patch =================================================================== --- packages/trunk/vodovod/debian/patches/hiscore_includes.patch 2008-02-28 23:09:06 UTC (rev 5933) +++ packages/trunk/vodovod/debian/patches/hiscore_includes.patch 2008-02-28 23:17:27 UTC (rev 5934) @@ -1,12 +0,0 @@ -diff -urN vodovod-1.10.orig/hiscore.cpp vodovod-1.10/hiscore.cpp ---- vodovod-1.10.orig/hiscore.cpp 2008-01-14 17:56:33.000000000 -0500 -+++ vodovod-1.10/hiscore.cpp 2008-01-14 17:59:59.000000000 -0500 -@@ -19,6 +19,8 @@ - -----------------------------------------------------------------------------*/ - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> -+#include <limits.h> - #include <sys/stat.h> - #include "hiscore.h" - //----------------------------------------------------------------------------- Modified: packages/trunk/vodovod/debian/patches/series =================================================================== --- packages/trunk/vodovod/debian/patches/series 2008-02-28 23:09:06 UTC (rev 5933) +++ packages/trunk/vodovod/debian/patches/series 2008-02-28 23:17:27 UTC (rev 5934) @@ -1,4 +1,4 @@ datadir.patch user_files.patch datadir_makefile.patch -hiscore_includes.patch +fix-FTBFS-with-gcc-4.3.patch _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits