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 c5c72ab..7491523 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -39,6 +39,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 @@ -53,6 +56,7 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 +%patch3 %if 0%{?fedora} > 24 # Installation directory has changed @@ -118,6 +122,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sun Aug 11 2019 D Haley - 0.0.21-4 +- Add workaround for crash under wayland (wx bug 17702) + * Thu Jan 31 2019 Fedora Release Engineering - 0.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild