rpms/mm3d/devel .cvsignore, 1.2, 1.3 mm3d-1.3.7-gcc44.patch, 1.1, 1.2 mm3d.spec, 1.2, 1.3 sources, 1.2, 1.3

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/mm3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7961

Modified Files:
	.cvsignore mm3d-1.3.7-gcc44.patch mm3d.spec sources 
Log Message:
* Tue Feb 24 2009 Dan Horak <dan[at]danny.cz> 1.3.7a-1
- update to 1.3.7a
- better fix for the conflict between list type and parameter



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm3d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2008 06:06:52 -0000	1.2
+++ .cvsignore	24 Feb 2009 08:37:01 -0000	1.3
@@ -1,3 +1,3 @@
 ad3dsfilter-0.8.1.tar.gz
 imtex-1.4.0.tar.gz
-mm3d-1.3.7.tar.gz
+mm3d-1.3.7a.tar.gz

mm3d-1.3.7-gcc44.patch:

Index: mm3d-1.3.7-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mm3d/devel/mm3d-1.3.7-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mm3d-1.3.7-gcc44.patch	19 Feb 2009 21:02:25 -0000	1.1
+++ mm3d-1.3.7-gcc44.patch	24 Feb 2009 08:37:01 -0000	1.2
@@ -1,3 +1,20 @@
+From a771ae75feb859c9708d90db8f54d75060ce20d8 Mon Sep 17 00:00:00 2001
+From: Dan Horak <dan at danny.cz>
+Date: Fri, 20 Feb 2009 09:52:24 +0100
+Subject: [PATCH] updates for gcc 4.4
+
+---
+ src/implui/keycfg.cc        |    2 ++
+ src/implui/qttex.cc         |    3 ++-
+ src/libmm3d/misc.cc         |    2 +-
+ src/libmm3d/mm3dport.cc     |    8 ++++----
+ src/libmm3d/mm3dport.h      |    2 +-
+ src/mm3dcore/luascript.cc   |    2 +-
+ src/mm3dcore/scriptif.cc    |    2 +-
+ src/mm3dcore/texturetest.cc |    2 ++
+ src/mm3dcore/tool.h         |    2 +-
+ 9 files changed, 15 insertions(+), 10 deletions(-)
+
 diff --git a/src/implui/keycfg.cc b/src/implui/keycfg.cc
 index 0906fd5..1ec8011 100644
 --- a/src/implui/keycfg.cc
@@ -137,38 +154,19 @@
  #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
+index 5f06428..6349950 100644
 --- a/src/mm3dcore/tool.h
 +++ b/src/mm3dcore/tool.h
-@@ -230,7 +230,7 @@ class Tool
-               const Model::Position & pos,
+@@ -231,7 +231,7 @@ class Tool
                double x, double y, double z );
  
--      void makeToolCoordList( Parent * parent, ToolCoordList & list, 
-+      void makeToolCoordList( Parent * parent, ToolCoordList & alist, 
-               const list< Model::Position > & positions );
+       void makeToolCoordList( Parent * parent, ToolCoordList & list, 
+-              const list< Model::Position > & positions );
++              const std::list< Model::Position > & positions );
  };
  
+ class ToolSeparator : public Tool
+-- 
+1.6.0.6
+


Index: mm3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mm3d/devel/mm3d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mm3d.spec	19 Feb 2009 21:02:25 -0000	1.2
+++ mm3d.spec	24 Feb 2009 08:37:02 -0000	1.3
@@ -4,8 +4,8 @@
 %define         major_version           1.3
 
 Name:           mm3d
-Version:        1.3.7
-Release:        3%{?dist}
+Version:        1.3.7a
+Release:        1%{?dist}
 Summary:        3D model editor
 
 Group:          Applications/Multimedia
@@ -122,6 +122,10 @@
 
 
 %changelog
+* Tue Feb 24 2009 Dan Horak <dan[at]danny.cz> 1.3.7a-1
+- update to 1.3.7a
+- better fix for the conflict between list type and parameter
+
 * Thu Feb 19 2009 Dan Horak <dan[at]danny.cz> 1.3.7-3
 - fixes for gcc 4.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm3d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jul 2008 06:06:52 -0000	1.2
+++ sources	24 Feb 2009 08:37:02 -0000	1.3
@@ -1,3 +1,3 @@
 d0d7be8bd51e912f1ef8bd4e122855d1  ad3dsfilter-0.8.1.tar.gz
 4b26d78210d251bc4f9fc392123ea02a  imtex-1.4.0.tar.gz
-6a5467d03d61a23af1ab51c47109c4d5  mm3d-1.3.7.tar.gz
+4aac3f895337b662359ab4dbc24e4be3  mm3d-1.3.7a.tar.gz