[meshlab/f15] Update to 1.3.1.

[Eric Smith]

commit 5cf194c2313bb728e9f9d2b24d272fa09779ade1
Author: Eric Smith <eric at brouhaha.com>
Date:   Tue Nov 1 00:08:56 2011 -0700

    Update to 1.3.1.

 meshlab-1.3.1-argcref.patch |   28 ++++++++++++++++++++++++++++
 meshlab.spec                |   11 ++++++++++-
 sources                     |    1 -
 3 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/meshlab-1.3.1-argcref.patch b/meshlab-1.3.1-argcref.patch
new file mode 100644
index 0000000..fb5251b
--- /dev/null
+++ b/meshlab-1.3.1-argcref.patch
@@ -0,0 +1,28 @@
+diff -up meshlab-1.3.1/meshlab/src/common/mlapplication.cpp.argcref meshlab-1.3.1/meshlab/src/common/mlapplication.cpp
+--- meshlab-1.3.1/meshlab/src/common/mlapplication.cpp.argcref	2011-10-31 22:27:07.000000000 -0700
++++ meshlab-1.3.1/meshlab/src/common/mlapplication.cpp	2011-10-31 22:27:40.000000000 -0700
+@@ -1,7 +1,7 @@
+ #include "mlapplication.h"
+ #include "mlexception.h"
+ 
+-MeshLabApplication::MeshLabApplication( int argc, char *argv[] )
++MeshLabApplication::MeshLabApplication( int &argc, char *argv[] )
+ :QApplication(argc,argv)
+ {
+ 
+diff -up meshlab-1.3.1/meshlab/src/common/mlapplication.h.argcref meshlab-1.3.1/meshlab/src/common/mlapplication.h
+--- meshlab-1.3.1/meshlab/src/common/mlapplication.h.argcref	2011-10-31 22:27:04.000000000 -0700
++++ meshlab-1.3.1/meshlab/src/common/mlapplication.h	2011-10-31 22:27:24.000000000 -0700
+@@ -6,9 +6,9 @@
+ class MeshLabApplication : public QApplication
+ {
+ public:
+-	MeshLabApplication(int argc, char *argv[]);
++	MeshLabApplication(int &argc, char *argv[]);
+ 	~MeshLabApplication();
+ 	bool notify(QObject * rec, QEvent * ev);
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/meshlab.spec b/meshlab.spec
index 216a144..206515b 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.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://meshlab.sourceforge.net/`
 
 Source0:	http://downloads.sourceforge.net/%{name}/MeshLabSrc_AllInc_v131.tgz
@@ -31,6 +31,11 @@ Patch5:		meshlab-1.3.1-glu.patch
 # Disable io_ctm until openctm is packaged
 Patch6:		meshlab-1.3.1-noctm.patch
 
+# Fix crash in XSetCommand() in XSetWMProperties() due to bad argc,
+# because mlapplication subclass of QApplication doesn't declare argc
+# as a reference.
+Patch7:		meshlab-1.3.1-argcref.patch
+
 License:	GPLv2+ and BSD
 Group:		Applications/Multimedia
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +76,7 @@ rm -rf meshlab-snapshot-svn3524
 %patch -P 4 -p1 -b .ply-numeric
 %patch -P 5 -p1 -b .glu
 %patch -P 6 -p1 -b .noctm
+%patch -P 7 -p1 -b .argcref
 
 # Turn of execute permissions on source files to avoid rpmlint
 # errors and warnings for the debuginfo package
@@ -204,6 +210,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/meshlab.png
 
 %changelog
+* Mon Oct 31 2011 Eric Smith <eric at brouhaha.com> - 1.3.1-2
+- Add new patch to avoid crash due to mishandling of argc
+
 * Fri Oct 21 2011 Orion Poplawski <orion at cora.nwra.com> - 1.3.1-1
 - Update to 1.3.1
 - Rebase patches
diff --git a/sources b/sources
index e4bdd59..d610e33 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 da8c1eb07f219896dbcffe35111d21b1  MeshLabSrc_AllInc_v131.tgz
 f06107dd01cbe0d6519dbb759ae84c11  MeshLabSrc_v122.tar.gz
-46c14a0fce7bed03113d54807f3c19bc  MeshLabSrc_AllInc_v130a.tgz