[meshlab] * Fri Sep 10 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-5 - Remove direct invocation of constructor

[Eric Smith]

commit 203c6df70081fb6710b10e3449ce6740e37fdeec
Author: Eric Smith <eric at brouhaha.com>
Date:   Fri Sep 10 22:58:49 2010 -0700

    * Fri Sep 10 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-5
    - Remove direct invocation of constructor to make GCC 4.5 happy

 meshlab-gcc45.patch |   19 +++++++++++++++++++
 meshlab.spec        |    9 ++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/meshlab-gcc45.patch b/meshlab-gcc45.patch
new file mode 100644
index 0000000..c93f718
--- /dev/null
+++ b/meshlab-gcc45.patch
@@ -0,0 +1,19 @@
+diff -up meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp.gcc45 meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp
+--- meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp.gcc45	2010-09-10 19:04:04.955733001 -0700
++++ meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp	2010-09-10 19:17:12.800733003 -0700
+@@ -535,7 +535,7 @@ void RichParameterFactory::create( const
+ 
+ 	if(type=="RichEnum")
+ 	{
+-		QStringList list = QStringList::QStringList();
++		QStringList list = QStringList();
+ 		unsigned int enum_card = np.attribute(QString("enum_cardinality")).toUInt();
+ 
+ 		for(int i=0;i<enum_card;++i)
+@@ -582,4 +582,4 @@ void RichParameterFactory::create( const
+ 	}
+ 
+ 	assert(0); // we are trying to parse an unknown xml element
+-}
+\ No newline at end of file
++}
diff --git a/meshlab.spec b/meshlab.spec
index 97b0029..9adcc7a 100644
--- a/meshlab.spec
+++ b/meshlab.spec
@@ -1,7 +1,7 @@
 Summary:	A system for processing and editing unstructured 3D triangular meshes
 Name:		meshlab
 Version:	1.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://meshlab.sourceforge.net/
 
 Source0:	http://downloads.sourceforge.net/%{name}/MeshLabSrc_v122.tar.gz
@@ -17,6 +17,9 @@ Patch2:		meshlab-shader-path.patch
 # http://sourceforge.net/tracker/?func=detail&aid=2872526&group_id=149444&atid=774731
 Patch3:		meshlab-vcglib-namespace.patch
 
+# Remove direct invocation of constructors to make GCC 4.5 happy
+Patch4:		meshlab-gcc45.patch
+
 License:	GPLv2+ and BSD
 Group:		Applications/Multimedia
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +48,7 @@ these kinds of meshes.
 %patch -P 1 -p1 -b .plugin-path
 %patch -P 2 -p1 -b .shader-path
 %patch -P 3 -p1 -b .vcglib-namespace
+%patch -P 4 -p1 -b .gcc45
 
 # Turn of execute permissions on source files to avoid rpmlint
 # errors and warnings for the debuginfo package
@@ -144,6 +148,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/meshlab.png
 
 %changelog
+* Fri Sep 10 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-5
+- Remove direct invocation of constructor to make GCC 4.5 happy
+
 * Mon May  3 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-4
 - in prep, remove bundled getopt library sources, to ensure
   that we're using the system library instead