[ri-li] 60/93: Fix FTBFS due to gcc4.3/pre-iso headers (Closes: #461705).
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Dec 2 17:55:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository ri-li.
commit f22e28c3ada86dcdded4a2f76fcd04b3075324ac
Author: Cyril Brulebois <kibi at debian.org>
Date: Sun Jan 20 21:31:37 2008 +0000
Fix FTBFS due to gcc4.3/pre-iso headers (Closes: #461705).
---
debian/changelog | 6 +-
debian/patches/40_fix_gcc4.3_ftbfs | 135 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 46cd99c..299ff4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ri-li (2.0.1-1) UNRELEASED; urgency=low
[ 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 @@ ri-li (2.0.1-1) UNRELEASED; urgency=low
* 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
diff --git a/debian/patches/40_fix_gcc4.3_ftbfs b/debian/patches/40_fix_gcc4.3_ftbfs
new file mode 100644
index 0000000..a0fb242
--- /dev/null
+++ b/debian/patches/40_fix_gcc4.3_ftbfs
@@ -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>
diff --git a/debian/patches/series b/debian/patches/series
index 3014a53..3e50446 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
20_remove_gentoo_dir.diff
-
+40_fix_gcc4.3_ftbfs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ri-li.git
More information about the Pkg-games-commits
mailing list