From ab28927c3516c851b01870e9a3c2dd3068525eb5 Mon Sep 17 00:00:00 2001
From: D Haley <mycae ( ) gmx com>
Date: Sun, 11 Aug 2019 23:31:18 +0100
Subject: [PATCH 1/3] * Add fix for wayland

---
 3Depict-0.0.21-wayland.patch | 21 +++++++++++++++++++++
 3Depict.spec                 |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 3Depict-0.0.21-wayland.patch

diff --git a/3Depict-0.0.21-wayland.patch b/3Depict-0.0.21-wayland.patch
new file mode 100644
index 0000000..3a9cf16
--- /dev/null
+++ b/3Depict-0.0.21-wayland.patch
@@ -0,0 +1,21 @@
+diff -r 13113574c8fc src/3Depict.cpp
+--- src/3Depict.cpp	Sun Aug 11 23:16:43 2019 +0100
++++ src/3Depict.cpp	Sun Aug 11 23:17:35 2019 +0100
+@@ -76,6 +76,17 @@
+ 
+ };
+ 
++//Wayland workaround - wx bug 17702
++#ifdef __WXGTK3__
++struct ForceX11 {
++	ForceX11(){
++		setenv("GDK_BACKEND","x11",1);
++	}
++};
++
++static struct ForceX11 forcex11;
++#endif
++
+ //Check version is in place because wxT is deprecated for wx 2.9
+ //Command line parameter table
+ static const wxCmdLineEntryDesc g_cmdLineDesc [] =
diff --git a/3Depict.spec b/3Depict.spec
index 6453ed2..c97bd81 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -11,7 +11,7 @@ Source0:	http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz
 
 
 #Mathgl for plotting
-BuildRequires:  gcc-c++
+BuildRequires:	gcc-c++
 BuildRequires:	mathgl-devel 
 #Mesa for GLU
 BuildRequires:	libGL-devel 
@@ -40,6 +40,9 @@ Patch0: %{name}-%{version}-manual-pdf-loc.patch
 Patch1: %{name}-%{version}-font-path.patch
 #Qhull dir has changed 
 Patch2: %{name}-%{version}-qhull.patch
+#wxGLCanvas not supported under wayland.
+# wx bug 17702
+Patch3: %{name}-%{version}-wayland.patch
 
 %description
 This software is designed to help users visualize and analyze 3D point clouds
@@ -54,6 +57,7 @@ useful for general scalar valued point data purposes.
 %patch0
 %patch1
 %patch2
+%patch3
 
 %if 0%{?fedora} > 24
 # Installation directory has changed
@@ -119,6 +123,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf
 
 
 %changelog
+* Sun Aug 11 2019 D Haley <mycae(a!t)gmx.com> - 0.0.12-3
+- Add workaround for crash under wayland (wx bug 17702)
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From f081a732cc146212dd9bcdb5a8f2fe824482839d Mon Sep 17 00:00:00 2001
From: D Haley <mycae ( ) gmx com>
Date: Sun, 11 Aug 2019 23:47:49 +0100
Subject: [PATCH 2/3] * Bump version

---
 3Depict.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3Depict.spec b/3Depict.spec
index c97bd81..6faceac 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,6 +1,6 @@
 Name:		3Depict
 Version:	0.0.21
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Valued 3D point cloud visualization and analysis
 Group:		Applications/Engineering
 

From d605fd6c2a466ae30673a744b8c9455fff3a9490 Mon Sep 17 00:00:00 2001
From: D Haley <mycae ( ) gmx com>
Date: Sun, 11 Aug 2019 23:54:25 +0100
Subject: [PATCH 3/3] * Fix typo in changelog

---
 3Depict.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3Depict.spec b/3Depict.spec
index 6faceac..defcd36 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -123,7 +123,7 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf
 
 
 %changelog
-* Sun Aug 11 2019 D Haley <mycae(a!t)gmx.com> - 0.0.12-3
+* Sun Aug 11 2019 D Haley <mycae(a!t)gmx.com> - 0.0.21-3
 - Add workaround for crash under wayland (wx bug 17702)
 
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-2