Bug#505626: NMU patch

[Steffen Joeris]

Hi

Please find the NMU patch attached.

Cheers
Steffen

diff -u mm3d-1.3.7/debian/changelog mm3d-1.3.7/debian/changelog
--- mm3d-1.3.7/debian/changelog
+++ mm3d-1.3.7/debian/changelog
@@ -1,3 +1,11 @@
+mm3d (1.3.7-1.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Fix FTBFS due to newer GCC compiler (Closes: #505626)
+    Thanks to Martin Michlmayr
+
+ -- Steffen Joeris <wh...@debian.org>  Fri, 22 Jan 2010 23:08:35 +0100
+
 mm3d (1.3.7-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/mm3dcore/tool.h
+++ mm3d-1.3.7/src/mm3dcore/tool.h
@@ -231,7 +231,7 @@
               double x, double y, double z );
 
       void makeToolCoordList( Parent * parent, ToolCoordList & list, 
-              const list< Model::Position > & positions );
+              const std::list< Model::Position > & positions );
 };
 
 class ToolSeparator : public Tool
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/mm3dcore/texturetest.cc
+++ mm3d-1.3.7/src/mm3dcore/texturetest.cc
@@ -24,6 +24,8 @@
 
 #include "texmgr.h"
 
+#include <cstdio>
+
 void texture_test_compare( const char * f1, const char * f2, unsigned fuzzyValue )
 {
    TextureManager * texmgr = TextureManager::getInstance();
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/mm3dcore/scriptif.cc
+++ mm3d-1.3.7/src/mm3dcore/scriptif.cc
@@ -43,7 +43,7 @@
 static string _getWriteFileName( const char * file )
 {
    string s = file;
-   char * ext = strrchr( file, '.' );
+   const char * ext = strrchr( file, '.' );
 
    if ( ext == NULL )
    {
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/implui/qttex.cc
+++ mm3d-1.3.7/src/implui/qttex.cc
@@ -27,6 +27,7 @@
 #include "mm3dconfig.h"
 #include "log.h"
 
+#include <cstdio>
 #include <ctype.h>
 
 #include <QtCore/QBuffer>
@@ -316,7 +317,7 @@
 
 void QtTextureFilter::getFormatString( char * format, const char * filename )
 {
-   char * ext = strrchr( filename, '.' );
+   const char * ext = strrchr( filename, '.' );
    if ( ext )
    {
       ext++; // Skip '.'
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/implui/keycfg.cc
+++ mm3d-1.3.7/src/implui/keycfg.cc
@@ -27,6 +27,8 @@
 
 #include <QtGui/QApplication>
 
+#include <cstdio>
+
 static void _chomp( char * str )
 {
    int len = 0;
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/libmm3d/misc.cc
+++ mm3d-1.3.7/src/libmm3d/misc.cc
@@ -299,7 +299,7 @@
       if ( pathIsAbsolute( path ) )
       {
          string rval;
-         char * temp = strrchr( path, '/' );
+         const char * temp = strrchr( path, '/' );
          if ( temp )
          {
             temp++;
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/libmm3d/mm3dport.h
+++ mm3d-1.3.7/src/libmm3d/mm3dport.h
@@ -54,7 +54,7 @@
 int    PORT_mkdir( const char * pathname, mode_t mode );
 int    PORT_snprintf( char * dest, size_t len, const char * fmt, ... );
 int    PORT_vsnprintf( char * dest, size_t len, const char * fmt, va_list args );
-char * PORT_strcasestr( const char * haystack, const char * needle );
+const char * PORT_strcasestr( const char * haystack, const char * needle );
 char * PORT_basename( const char * path );
 char * PORT_dirname( const char * path );
 
only in patch2:
unchanged:
--- mm3d-1.3.7.orig/src/libmm3d/mm3dport.cc
+++ mm3d-1.3.7/src/libmm3d/mm3dport.cc
@@ -247,7 +247,7 @@
    }
 }
 #else
-char * PORT_strcasestr( const char * haystack, const char * needle )
+const char * PORT_strcasestr( const char * haystack, const char * needle )
 {
    return strcasestr( haystack, needle );
 }
@@ -258,7 +258,7 @@
    static char rval[ PATH_MAX ] = "";
    if ( path )
    {
-      char * start = strrchr( path, '/' );
+      const char * start = strrchr( path, '/' );
 
       if ( !start )
       {

signature.asc
Description: This is a digitally signed message part.