r5478 - in packages/trunk/ri-li/debian: . patches

Cyril Brulebois kibi-guest at alioth.debian.org
Sun Jan 20 21:31:37 UTC 2008 

Author: kibi-guest
Date: 2008-01-20 21:31:37 +0000 (Sun, 20 Jan 2008)
New Revision: 5478

Added:
   packages/trunk/ri-li/debian/patches/40_fix_gcc4.3_ftbfs
Modified:
   packages/trunk/ri-li/debian/changelog
   packages/trunk/ri-li/debian/patches/series
Log:
Fix FTBFS due to gcc4.3/pre-iso headers (Closes: #461705).

Modified: packages/trunk/ri-li/debian/changelog
===================================================================
--- packages/trunk/ri-li/debian/changelog	2008-01-19 22:52:35 UTC (rev 5477)
+++ packages/trunk/ri-li/debian/changelog	2008-01-20 21:31:37 UTC (rev 5478)
@@ -2,6 +2,10 @@
 
   [ Cyril Brulebois ]
   * Fix typos in the long description (Closes: #444827).
+  * Fix FTBFS with gcc 4.3 by getting rid of pre-ISO C++ headers,
+    replacing “#include <iostream.h>” with “#include <iostream>”
+    followed by “using namespace std;” (Closes: #461705). Add the
+    40_fix_gcc4.3_ftbfs patch to this effect.
 
   [ Eddy Petrișor ]
   * remove myself from the Uploaders list
@@ -12,7 +16,7 @@
   * Remove XS- from VCS fields in control
   * Add Homepage field in control
   * 20_remove_gentoo_dir.diff - Remove gentoo subdir from Makefile.*
-  * Bug #383007 mentions using a merged tarball to get the data package 
+  * Bug #383007 mentions using a merged tarball to get the data package
     + source but I am not sure how to effectively do that.
 
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Mon, 15 Oct 2007 23:07:57 +0300

Added: packages/trunk/ri-li/debian/patches/40_fix_gcc4.3_ftbfs
===================================================================
--- packages/trunk/ri-li/debian/patches/40_fix_gcc4.3_ftbfs	                        (rev 0)
+++ packages/trunk/ri-li/debian/patches/40_fix_gcc4.3_ftbfs	2008-01-20 21:31:37 UTC (rev 5478)
@@ -0,0 +1,135 @@
+--- a/src/audio.cc	2008-01-20 22:19:41.000000000 +0100
++++ b/src/audio.cc	2008-01-20 22:22:38.000000000 +0100
+@@ -21,8 +21,9 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
++#include <iostream>
++using namespace std;
+ #include <stdlib.h>
+-#include <iostream.h>
+ #include <string.h>
+ 
+ #include "audio.h"
+--- a/src/ecran.cc	2008-01-20 22:23:12.000000000 +0100
++++ b/src/ecran.cc	2008-01-20 22:23:22.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+--- a/src/editeur.cc	2008-01-20 22:23:31.000000000 +0100
++++ b/src/editeur.cc	2008-01-20 22:23:41.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include <windows.h>
+ #endif
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/jeux.cc	2008-01-20 22:23:51.000000000 +0100
++++ b/src/jeux.cc	2008-01-20 22:24:04.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include <windows.h>
+ #endif
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/loco.cc	2008-01-20 22:24:21.000000000 +0100
++++ b/src/loco.cc	2008-01-20 22:24:32.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/main.cc	2008-01-20 22:24:40.000000000 +0100
++++ b/src/main.cc	2008-01-20 22:24:51.000000000 +0100
+@@ -21,9 +21,10 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
+ #include <string.h>
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_mixer.h>
+--- a/src/menu.cc	2008-01-20 22:24:59.000000000 +0100
++++ b/src/menu.cc	2008-01-20 22:25:09.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/mouse.cc	2008-01-20 22:25:19.000000000 +0100
++++ b/src/mouse.cc	2008-01-20 22:25:32.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include "mouse.h"
+ #include "preference.h"
+--- a/src/sprite.cc	2008-01-20 22:25:45.000000000 +0100
++++ b/src/sprite.cc	2008-01-20 22:25:55.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/tableau.cc	2008-01-20 22:26:05.000000000 +0100
++++ b/src/tableau.cc	2008-01-20 22:26:16.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "preference.h"
+--- a/src/utils.cc	2008-01-20 22:26:24.000000000 +0100
++++ b/src/utils.cc	2008-01-20 22:26:33.000000000 +0100
+@@ -21,7 +21,8 @@
+ //    with this program; if not, write to the Free Software Foundation, Inc.,
+ //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

Modified: packages/trunk/ri-li/debian/patches/series
===================================================================
--- packages/trunk/ri-li/debian/patches/series	2008-01-19 22:52:35 UTC (rev 5477)
+++ packages/trunk/ri-li/debian/patches/series	2008-01-20 21:31:37 UTC (rev 5478)
@@ -1,2 +1,2 @@
 20_remove_gentoo_dir.diff
-
+40_fix_gcc4.3_ftbfs

More information about the Pkg-games-commits mailing list