Compare commits

...
This repository has been archived on 2026-01-16. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.

3 commits

Author SHA1 Message Date
D Haley
d605fd6c2a * Fix typo in changelog 2019-08-11 23:54:25 +01:00
D Haley
f081a732cc * Bump version 2019-08-11 23:47:49 +01:00
D Haley
ab28927c35 * Add fix for wayland 2019-08-11 23:46:28 +01:00
2 changed files with 30 additions and 2 deletions

View file

@ -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 [] =

View file

@ -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
@ -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.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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild