diff --git a/3Depict-0.0.20-abort_tapsim_load.patch b/3Depict-0.0.20-abort_tapsim_load.patch new file mode 100644 index 0000000..973d96f --- /dev/null +++ b/3Depict-0.0.20-abort_tapsim_load.patch @@ -0,0 +1,15 @@ +diff -r eeac55f99398 src/backend/APT/APTFileIO.cpp +--- src/backend/APT/APTFileIO.cpp Mon Feb 13 02:29:47 2017 +0000 ++++ src/backend/APT/APTFileIO.cpp Mon Feb 13 02:34:25 2017 +0000 +@@ -1222,8 +1222,9 @@ + //Transfer position data + #ifdef __LITTLE_ENDIAN__ + h.setPos(Point3D((float*)(buffer))); +-#elif __BIG_ENDIAN__ +- static_assert(false); //TODO: IMPLEMENT ME ++#else ++ //FIXME: Implement me ++ return TAPSIM_ERR_FILE_FORMAT_FAIL; + #endif + //assign the ID as the mass to charge + h.setMassToCharge(*( (short*)(buffer+12) )); diff --git a/3Depict.spec b/3Depict.spec index 8f9c7cc..102296d 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -37,6 +37,9 @@ BuildRequires: qhull-devel Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir Patch1: %{name}-%{version}-font-path.patch +#Disable attempting to load tapsim files on non Little-endian +# arches. To be dealt with by upstream +Patch2: %{name}-%{version}-abort_tapsim_load.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -50,6 +53,7 @@ useful for general scalar valued point data purposes. %patch0 %patch1 +%patch2 %if 0%{?fedora} > 24 # Installation directory has changed