From 4ee8b6b4bb506b51a36ba90871b907e13b1b8b2b Mon Sep 17 00:00:00 2001
From: D Haley <mycae ( ) gmx com>
Date: Aug 11 2019 22:18:48 +0000
Subject: * Patch to force X11 use when running wayland


---

diff --git a/3Depict-0.0.22-wayland.patch b/3Depict-0.0.22-wayland.patch
new file mode 100644
index 0000000..3a9cf16
--- /dev/null
+++ b/3Depict-0.0.22-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 607c850..6c56c9a 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,6 +1,6 @@
 Name:		3Depict
 Version:	0.0.22
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Valued 3D point cloud visualization and analysis
 
 
@@ -42,6 +42,9 @@ Patch2: %{name}-%{version}-qhull.patch
 #Fix for PPC64 arch
 Patch3: %{name}-%{version}-qhull_ppc64le.patch
 
+#wxGLCanvas not supported under wayland.
+# wx bug 17702
+Patch4: %{name}-%{version}-wayland.patch
 %description
 This software is designed to help users visualize and analyze 3D point clouds
 with an associated real value, in a fast and flexible fashion. It is 
@@ -56,6 +59,7 @@ useful for general scalar valued point data purposes.
 %patch1
 %patch2
 %patch3
+%patch4
 
 %if 0%{?fedora} > 24
 # Installation directory has changed
@@ -121,6 +125,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.22-4
+- Add workaround for crash under wayland (wx bug 17702)
+
 * Sun Aug 11 2019 D Haley <mycae(a!t)gmx.com> - 0.0.22-3
 - Fix for PPC64LE qhull include bug (#1735406)