From c3f9d5f38f6b783a48a219c51d5e203b029f7ba1 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mar 09 2016 02:49:54 +0000
Subject: Add patch for fix compilation with gcc 6


---

diff --git a/3Depict-gcc6.patch b/3Depict-gcc6.patch
new file mode 100644
index 0000000..96e9bd4
--- /dev/null
+++ b/3Depict-gcc6.patch
@@ -0,0 +1,12 @@
+diff -up 3Depict-0.0.18/src/common/stringFuncs.cpp.gcc6 3Depict-0.0.18/src/common/stringFuncs.cpp
+--- 3Depict-0.0.18/src/common/stringFuncs.cpp.gcc6	2016-03-08 19:17:26.511474604 -0700
++++ 3Depict-0.0.18/src/common/stringFuncs.cpp	2016-03-08 19:17:47.243499854 -0700
+@@ -229,7 +229,7 @@ bool genRandomFilename(std::string &s,bo
+ 		retry++;
+ 	}
+ 	while(!f && (retry < MAX_RETRY) );
+-	return f;
++	return static_cast<bool>(f);
+ 
+ }
+ 
diff --git a/3Depict.spec b/3Depict.spec
index 59d0fad..7427521 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,6 +1,6 @@
 Name:		3Depict
 Version:	0.0.18
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Valued 3D point cloud visualization and analysis
 Group:		Applications/Engineering
 
@@ -37,6 +37,8 @@ BuildRequires: qhull-devel
 Patch0: %{name}-%{version}-manual-pdf-loc.patch
 #Fedora specific font dir
 Patch1: %{name}-%{version}-font-path.patch
+#Fix gcc6 compilation
+Patch2: %{name}-gcc6.patch
 
 
 %description
@@ -51,6 +53,7 @@ useful for general scalar valued point data purposes.
 
 %patch0
 %patch1
+%patch2 -p1 -b .gcc6
 
 %build
 #Due to bug 1077718, wx-config cannot be specified, due to
@@ -108,6 +111,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf
 
 
 %changelog
+* Tue Mar 8 2016 Orion Poplawski <orion@cora.nwra.com> - 0.0.18-6
+- Add patch for fix compilation with gcc 6
+
 * Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 0.0.18-5
 - Rebuild for gsl 2.1
 - Cleanup spec