rpms/mm3d/devel mm3d-1.3.7-gcc44.patch,NONE,1.1 mm3d.spec,1.1,1.2
Dan Horák
sharkcz at fedoraproject.org
Thu Feb 19 21:02:56 UTC 2009
Author: sharkcz
Update of /cvs/pkgs/rpms/mm3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12932
Modified Files:
mm3d.spec
Added Files:
mm3d-1.3.7-gcc44.patch
Log Message:
* Thu Feb 19 2009 Dan Horak <dan[at]danny.cz> 1.3.7-3
- fixes for gcc 4.4
mm3d-1.3.7-gcc44.patch:
--- NEW FILE mm3d-1.3.7-gcc44.patch ---
diff --git a/src/implui/keycfg.cc b/src/implui/keycfg.cc
index 0906fd5..1ec8011 100644
--- a/src/implui/keycfg.cc
+++ b/src/implui/keycfg.cc
@@ -20,6 +20,8 @@
* See the COPYING file for full license text.
*/
+#include <cstdio>
+
#include "keycfg.h"
#include "log.h"
diff --git a/src/implui/qttex.cc b/src/implui/qttex.cc
index 79064ab..496023c 100644
--- a/src/implui/qttex.cc
+++ b/src/implui/qttex.cc
@@ -28,6 +28,7 @@
#include "log.h"
#include <ctype.h>
+#include <cstdio>
#include <QtCore/QBuffer>
#include <QtCore/QString>
@@ -316,7 +317,7 @@ list<string> QtTextureFilter::getWriteTypes()
void QtTextureFilter::getFormatString( char * format, const char * filename )
{
- char * ext = strrchr( filename, '.' );
+ const char * ext = strrchr( filename, '.' );
if ( ext )
{
ext++; // Skip '.'
diff --git a/src/libmm3d/misc.cc b/src/libmm3d/misc.cc
index 82130b0..db6270e 100644
--- a/src/libmm3d/misc.cc
+++ b/src/libmm3d/misc.cc
@@ -299,7 +299,7 @@ string fixAbsolutePath( const char * base, const char * path )
if ( pathIsAbsolute( path ) )
{
string rval;
- char * temp = strrchr( path, '/' );
+ const char * temp = strrchr( path, '/' );
if ( temp )
{
temp++;
diff --git a/src/libmm3d/mm3dport.cc b/src/libmm3d/mm3dport.cc
index bf8ba12..e067aae 100644
--- a/src/libmm3d/mm3dport.cc
+++ b/src/libmm3d/mm3dport.cc
@@ -213,7 +213,7 @@ int PORT_vsnprintf( char * dest, size_t len, const char * fmt, va_list args )
}
#ifdef WIN32
-char * PORT_strcasestr( const char * haystack, const char * needle )
+const char * PORT_strcasestr( const char * haystack, const char * needle )
{
bool match;
@@ -239,7 +239,7 @@ char * PORT_strcasestr( const char * haystack, const char * needle )
if ( match )
{
- return (char *) &haystack[i];
+ return (const char *) &haystack[i];
}
else
{
@@ -247,7 +247,7 @@ char * PORT_strcasestr( const char * haystack, const char * needle )
}
}
#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 @@ char * PORT_basename( const char * path )
static char rval[ PATH_MAX ] = "";
if ( path )
{
- char * start = strrchr( path, '/' );
+ const char * start = strrchr( path, '/' );
if ( !start )
{
diff --git a/src/libmm3d/mm3dport.h b/src/libmm3d/mm3dport.h
index 96ad924..08c5277 100644
--- a/src/libmm3d/mm3dport.h
+++ b/src/libmm3d/mm3dport.h
@@ -54,7 +54,7 @@ int PORT_symlink( const char * oldpath, const char * newpath );
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 );
diff --git a/src/mm3dcore/luascript.cc b/src/mm3dcore/luascript.cc
index e5d732d..64d8fe4 100644
--- a/src/mm3dcore/luascript.cc
+++ b/src/mm3dcore/luascript.cc
@@ -138,7 +138,7 @@ int LuaScript::runFile( const char * filename )
}
// strip bracket from error string
- char * bracket = strchr( m_errstr.c_str(), ']' );
+ const char * bracket = strchr( m_errstr.c_str(), ']' );
if ( bracket )
{
bracket++;
diff --git a/src/mm3dcore/scriptif.cc b/src/mm3dcore/scriptif.cc
index 768fc81..96822b8 100644
--- a/src/mm3dcore/scriptif.cc
+++ b/src/mm3dcore/scriptif.cc
@@ -43,7 +43,7 @@ typedef vector<int> IntList;
static string _getWriteFileName( const char * file )
{
string s = file;
- char * ext = strrchr( file, '.' );
+ const char * ext = strrchr( file, '.' );
if ( ext == NULL )
{
diff --git a/src/mm3dcore/texturetest.cc b/src/mm3dcore/texturetest.cc
index 0794c0f..d97f2ca 100644
--- a/src/mm3dcore/texturetest.cc
+++ b/src/mm3dcore/texturetest.cc
@@ -20,6 +20,8 @@
* See the COPYING file for full license text.
*/
+#include <cstdio>
+
#include "texturetest.h"
#include "texmgr.h"
diff --git a/src/mm3dcore/tool.cc b/src/mm3dcore/tool.cc
index dadea54..2d0ebd5 100644
--- a/src/mm3dcore/tool.cc
+++ b/src/mm3dcore/tool.cc
@@ -124,7 +124,7 @@ void Tool::movePosition( Tool::Parent * parent,
tranVec[0], tranVec[1], tranVec[2] );
}
-void Tool::makeToolCoordList( Parent * parent, ToolCoordList & list,
+void Tool::makeToolCoordList( Parent * parent, ToolCoordList & alist,
const std::list< Model::Position > & positions )
{
Model * model = parent->getModel();
@@ -146,7 +146,7 @@ void Tool::makeToolCoordList( Parent * parent, ToolCoordList & list,
tc.newCoords[1] = tc.oldCoords[1];
tc.newCoords[2] = tc.oldCoords[2];
- list.push_back( tc );
+ alist.push_back( tc );
}
}
diff --git a/src/mm3dcore/tool.h b/src/mm3dcore/tool.h
index 5f06428..22057b9 100644
--- a/src/mm3dcore/tool.h
+++ b/src/mm3dcore/tool.h
@@ -230,7 +230,7 @@ class Tool
const Model::Position & pos,
double x, double y, double z );
- void makeToolCoordList( Parent * parent, ToolCoordList & list,
+ void makeToolCoordList( Parent * parent, ToolCoordList & alist,
const list< Model::Position > & positions );
};
Index: mm3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mm3d/devel/mm3d.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mm3d.spec 5 Jul 2008 06:06:52 -0000 1.1
+++ mm3d.spec 19 Feb 2009 21:02:25 -0000 1.2
@@ -5,7 +5,7 @@
Name: mm3d
Version: 1.3.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D model editor
Group: Applications/Multimedia
@@ -17,6 +17,7 @@
Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz
Patch0: mm3d-1.3.6-sighandler.patch
Patch1: mm3d-1.3.7-autoconf.patch
+Patch2: mm3d-1.3.7-gcc44.patch
Patch10: mm3d-ad3dsfilter-make.patch
Patch11: mm3d-imtex-make.patch
Patch12: mm3d-imtex-gcc43.patch
@@ -41,6 +42,7 @@
%patch0 -b .sigh
%patch1 -p1 -b .autoconf
+%patch2 -p1 -b .gcc44
%patch10 -b .ad3ds
%patch11 -b .imtex
@@ -53,6 +55,11 @@
dos2unix -q --keepdate $i
done
+# remove the pregenerated files, so they are renewed during the build
+rm src/depui/*.moc.cc
+rm src/implui/*.moc.cc
+rm src/tools/*.moc.cc
+
%build
export CPPFLAGS="-DDOC_ROOT=\\\"%{_docdir}/%{name}-%{version}/html\\\" -DSHARED_PLUGINS=\\\"%{_libdir}/%{name}\\\""
@@ -115,6 +122,9 @@
%changelog
+* Thu Feb 19 2009 Dan Horak <dan[at]danny.cz> 1.3.7-3
+- fixes for gcc 4.4
+
* Fri Jun 4 2008 Dan Horak <dan[at]danny.cz> 1.3.7-2
- fix plugin installation directory
- change how the docs are installed
More information about the fedora-extras-commits
mailing list