tags 470971 + patch
stop
Here is a patch for this issue.
The build later fails in dpkg-shlibdeps, but I figured I'd leave my
intermediate results here.
diff -u aqsis-1.2.0/debian/changelog aqsis-1.2.0/debian/changelog
--- aqsis-1.2.0/debian/changelog
+++ aqsis-1.2.0/debian/changelog
@@ -1,3 +1,11 @@
+aqsis (1.2.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Extended 01_gcc_4.3_fixes.patch to fix more build problems with GCC 4.3
+ (closes: #470971)
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]> Wed, 07 May 2008 16:11:52 +0200
+
aqsis (1.2.0-2) unstable; urgency=low
* Added support for quilt in debian/control and debian/rules.
diff -u aqsis-1.2.0/debian/patches/01_gcc_4.3_fixes.patch aqsis-1.2.0/debian/patches/01_gcc_4.3_fixes.patch
--- aqsis-1.2.0/debian/patches/01_gcc_4.3_fixes.patch
+++ aqsis-1.2.0/debian/patches/01_gcc_4.3_fixes.patch
@@ -1,7 +1,7 @@
Index: argparse/argparse.cpp
===================================================================
---- argparse/argparse.cpp.orig 2007-05-29 12:37:17.354581279 +0200
-+++ argparse/argparse.cpp 2007-05-29 12:37:27.355269699 +0200
+--- argparse/argparse.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ argparse/argparse.cpp 2008-05-07 17:52:07.000000000 +0200
@@ -17,6 +17,7 @@
*/
@@ -12,8 +12,8 @@
#include <functional>
Index: renderer/aqsis/aqsis.cpp
===================================================================
---- renderer/aqsis/aqsis.cpp.orig 2007-05-29 12:37:39.088077145 +0200
-+++ renderer/aqsis/aqsis.cpp 2007-05-29 12:38:11.002272343 +0200
+--- renderer/aqsis/aqsis.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/aqsis/aqsis.cpp 2008-05-07 17:52:07.000000000 +0200
@@ -36,9 +36,11 @@
#endif // AQSIS_SYSTEM_WIN32
#include <fcntl.h>
@@ -28,9 +28,9 @@
#include <vector>
Index: rib/miqser/miqser.cpp
===================================================================
---- rib/miqser/miqser.cpp.orig 2007-05-29 12:36:46.104429031 +0200
-+++ rib/miqser/miqser.cpp 2007-05-29 12:37:13.246298428 +0200
-@@ -35,10 +35,12 @@
+--- rib/miqser/miqser.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ rib/miqser/miqser.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -35,14 +35,17 @@
#endif // AQSIS_SYSTEM_WIN32
#include <fcntl.h>
@@ -43,10 +43,15 @@
#include <string>
#include <vector>
#include <stdio.h>
+ #include <time.h>
++#include <string.h>
+
+ #ifdef AQSIS_SYSTEM_WIN32
+ #include <windows.h>
Index: rib/rib2/bdec.cpp
===================================================================
---- rib/rib2/bdec.cpp.orig 2007-05-29 12:36:25.375000447 +0200
-+++ rib/rib2/bdec.cpp 2007-05-29 12:36:36.531769416 +0200
+--- rib/rib2/bdec.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ rib/rib2/bdec.cpp 2008-05-07 17:52:07.000000000 +0200
@@ -34,6 +34,7 @@
#include "logging.h"
@@ -57,9 +62,9 @@
Index: shadercompiler/aqsl/aqslcomp.cpp
===================================================================
---- shadercompiler/aqsl/aqslcomp.cpp.orig 2007-05-29 12:38:41.704389152 +0200
-+++ shadercompiler/aqsl/aqslcomp.cpp 2007-05-29 12:39:08.574250903 +0200
-@@ -28,8 +28,10 @@
+--- shadercompiler/aqsl/aqslcomp.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/aqsl/aqslcomp.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -28,10 +28,13 @@
#include "logging.h"
#include "logging_streambufs.h"
@@ -69,11 +74,14 @@
+#include <memory>
#include <sstream>
#include <stdio.h>
++#include <string.h>
+ #ifdef AQSIS_SYSTEM_WIN32
+ #include "io.h"
Index: shadercompiler/aqsltell/aqsltell.cpp
===================================================================
---- shadercompiler/aqsltell/aqsltell.cpp.orig 2007-05-29 12:39:20.679089142 +0200
-+++ shadercompiler/aqsltell/aqsltell.cpp 2007-05-29 12:39:39.080362840 +0200
+--- shadercompiler/aqsltell/aqsltell.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/aqsltell/aqsltell.cpp 2008-05-07 17:52:07.000000000 +0200
@@ -40,6 +40,7 @@
#include "slx.h"
#include "version.h"
@@ -82,10 +90,18 @@
#include <iostream>
#include <iomanip>
#include <fstream>
+@@ -47,6 +48,7 @@
+ #include <vector>
+
+ #include <stdio.h>
++#include <string.h>
+
+
+ namespace Aqsis
Index: shadercompiler/codegenvm/vmoutput.cpp
===================================================================
---- shadercompiler/codegenvm/vmoutput.cpp.orig 2007-05-29 12:38:14.110486053 +0200
-+++ shadercompiler/codegenvm/vmoutput.cpp 2007-05-29 12:38:29.443540082 +0200
+--- shadercompiler/codegenvm/vmoutput.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/codegenvm/vmoutput.cpp 2008-05-07 17:52:07.000000000 +0200
@@ -29,6 +29,7 @@
#include <sstream>
#endif
@@ -99,11 +115,293 @@
---- texturing/teqser/teqser.cpp.orig 2007-05-29 12:39:50.841176553 +0200
-+++ texturing/teqser/teqser.cpp 2007-05-29 12:40:50.677312430 +0200
-@@ -3,6 +3,8 @@
+--- texturing/teqser/teqser.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ texturing/teqser/teqser.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -2,7 +2,10 @@
+ //
#include <stdio.h>
++#include <string.h>
+#include <cstdlib>
+#include <memory>
#ifdef AQSIS_SYSTEM_WIN32
#include <conio.h>
+Index: renderer/ddmanager/ddmanager.cpp
+===================================================================
+--- renderer/ddmanager/ddmanager.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/ddmanager/ddmanager.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -40,6 +40,8 @@
+ #include "version.h"
+ #include "debugdd.h"
+
++#include <string.h>
++
+ START_NAMESPACE( Aqsis )
+
+
+Index: rib/rib2/parser.yy
+===================================================================
+--- rib/rib2/parser.yy.orig 2008-05-07 17:51:57.000000000 +0200
++++ rib/rib2/parser.yy 2008-05-07 17:52:07.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <string>
+ #include <vector>
+ #include <cassert>
++#include <string.h>
+
+ #ifdef _DEBUG
+ #define YYDEBUG 1
+Index: shadercompiler/shaderexecenv/shadeops_inter.cpp
+===================================================================
+--- shadercompiler/shaderexecenv/shadeops_inter.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/shaderexecenv/shadeops_inter.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <string>
+ #include <stdio.h>
++#include <string.h>
+
+ #if defined(REGEXP)
+ #include <regex.h>
+Index: shadercompiler/shaderexecenv/shadeops_text.cpp
+===================================================================
+--- shadercompiler/shaderexecenv/shadeops_text.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/shaderexecenv/shadeops_text.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <string>
+ #include <stdio.h>
++#include <string.h>
+
+ #include "shaderexecenv.h"
+ #include "shadervm.h"
+Index: shadercompiler/shaderexecenv/shadeops_tmap.cpp
+===================================================================
+--- shadercompiler/shaderexecenv/shadeops_tmap.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/shaderexecenv/shadeops_tmap.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <string>
+ #include <stdio.h>
++#include <string.h>
+
+ #include "shaderexecenv.h"
+ #include "shadervm.h"
+Index: shadercompiler/shadervm/dsoshadeops.cpp
+===================================================================
+--- shadercompiler/shadervm/dsoshadeops.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/shadervm/dsoshadeops.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -19,6 +19,7 @@
+ */
+
+ #include <sys/stat.h>
++#include <string.h>
+
+ #include "aqsis.h"
+ #include "sstring.h"
+Index: shadercompiler/shadervm/shadervm.cpp
+===================================================================
+--- shadercompiler/shadervm/shadervm.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/shadervm/shadervm.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <sstream>
+ #include <ctype.h>
+ #include <stddef.h>
++#include <string.h>
+
+ #include "shadervm.h"
+ #include "symbols.h"
+Index: renderer/render/blobby.cpp
+===================================================================
+--- renderer/render/blobby.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/blobby.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <vector>
+ #include <list>
+ #include <limits>
++#include <string.h>
+
+ #include "aqsis.h"
+ #include "ri.h"
+Index: renderer/render/bucket.cpp
+===================================================================
+--- renderer/render/bucket.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/bucket.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include <windows.h>
+ #endif
+ #include <math.h>
++#include <string.h>
+
+ #include "surface.h"
+ #include "imagepixel.h"
+Index: renderer/render/condition.cpp
+===================================================================
+--- renderer/render/condition.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/condition.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -31,6 +31,8 @@
+ #include "renderer.h"
+ #include "logging.h"
+
++#include <string.h>
++
+
+ START_NAMESPACE( Aqsis )
+
+Index: renderer/render/environment.cpp
+===================================================================
+--- renderer/render/environment.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/environment.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <math.h>
+ #include <iostream>
+ #include <fstream>
++#include <string.h>
+
+ #include "texturemap.h"
+ #include "random.h"
+Index: renderer/render/ri_cache.h
+===================================================================
+--- renderer/render/ri_cache.h.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/ri_cache.h 2008-05-07 17:52:07.000000000 +0200
+@@ -32,6 +32,8 @@
+ #include "ri.h"
+ #include "renderer.h"
+
++#include <string.h>
++
+ START_NAMESPACE( Aqsis )
+
+
+Index: renderer/render/shadowmap.cpp
+===================================================================
+--- renderer/render/shadowmap.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/shadowmap.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <math.h>
+ #include <iostream>
+ #include <fstream>
++#include <string.h>
+
+ #include "texturemap.h"
+ #include "random.h"
+Index: renderer/render/stats.cpp
+===================================================================
+--- renderer/render/stats.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/stats.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include <iomanip>
+ #include <iostream>
+ #include <math.h>
++#include <string.h>
+
+ START_NAMESPACE( Aqsis )
+
+Index: renderer/render/texturemap.cpp
+===================================================================
+--- renderer/render/texturemap.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ renderer/render/texturemap.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <math.h>
+ #include <iostream>
+ #include <fstream>
++#include <string.h>
+
+ #include "texturemap.h"
+ #include "rifile.h"
+Index: rib/rib2ri/librib2ri.cpp
+===================================================================
+--- rib/rib2ri/librib2ri.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ rib/rib2ri/librib2ri.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -2,6 +2,7 @@
+ using namespace librib;
+
+ #include "ri.h"
++#include <string.h>
+
+ namespace librib2ri
+ {
+Index: shadercompiler/slparse/parser.cpp
+===================================================================
+--- shadercompiler/slparse/parser.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/slparse/parser.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -206,6 +206,7 @@
+ #include <string>
+ #include <vector>
+ #include <cassert>
++#include <string.h>
+
+ #include "parsenode.h"
+ #include "logging.h"
+Index: shadercompiler/slparse/parser.yy
+===================================================================
+--- shadercompiler/slparse/parser.yy.orig 2008-05-07 17:51:57.000000000 +0200
++++ shadercompiler/slparse/parser.yy 2008-05-07 17:52:07.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <vector>
+ #include <cassert>
++#include <string.h>
+
+ #include "parsenode.h"
+ #include "logging.h"
+Index: rib/ri2rib/context.cpp
+===================================================================
+--- rib/ri2rib/context.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ rib/ri2rib/context.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -31,6 +31,8 @@
+ #include "binary.h"
+ #include "error.h"
+
++#include <string.h>
++
+ USING_NAMESPACE( libri2rib )
+
+
+Index: rib/ri2rib/output.cpp
+===================================================================
+--- rib/ri2rib/output.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ rib/ri2rib/output.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include "context.h"
+
+ #include "stddef.h"
++#include <string.h>
+
+ USING_NAMESPACE( libri2rib );
+
+Index: displays/display/display.cpp
+===================================================================
+--- displays/display/display.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ displays/display/display.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -25,6 +25,7 @@
+
+ #include <aqsis.h>
+
++#include <string.h>
+ #include <iostream>
+ #include <logging.h>
+ #include <logging_streambufs.h>
+Index: displays/d_xpm/aspXpm.cpp
+===================================================================
+--- displays/d_xpm/aspXpm.cpp.orig 2008-05-07 17:51:57.000000000 +0200
++++ displays/d_xpm/aspXpm.cpp 2008-05-07 17:52:07.000000000 +0200
+@@ -1,5 +1,7 @@
+ #include "aspXpm.h"
+
++#include <string.h>
++
+
+ aspXpm::aspXpm( const char *filename, int width, int height, int bpp )
+ {
+Index: displays/d_xpm/xpm.cpp
+===================================================================
+--- displays/d_xpm/xpm.cpp.orig 2008-05-07 17:52:12.000000000 +0200
++++ displays/d_xpm/xpm.cpp 2008-05-07 17:52:18.000000000 +0200
+@@ -9,6 +9,7 @@
+
+
+ #include <iostream>
++#include <string.h>
+ #undef DSPY_INTERNAL
+ #include "ndspy.h"
+ #include "aspXpm.h"
