[meshlab/f16] Update to 1.3.1.

Eric Smith brouhaha at fedoraproject.org
Tue Nov 1 07:32:54 UTC 2011


commit 057cd5127193201e4fd527efbed60871e4f5b7f8
Author: Eric Smith <eric at brouhaha.com>
Date:   Tue Nov 1 00:32:52 2011 -0700

    Update to 1.3.1.

 meshlab.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
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


More information about the scm-commits mailing list