From eea52948a70d92ccab6f584a0f2ceff573ed4979 Mon Sep 17 00:00:00 2001 From: D Haley Date: Aug 11 2019 19:08:48 +0000 Subject: * Fix for bug #1735406 --- diff --git a/3Depict-0.0.22-qhull_ppc64le.patch b/3Depict-0.0.22-qhull_ppc64le.patch new file mode 100644 index 0000000..67a5c36 --- /dev/null +++ b/3Depict-0.0.22-qhull_ppc64le.patch @@ -0,0 +1,25 @@ +diff -r 419306b866c3 src/backend/filters/algorithms/spatial.cpp +--- a/src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:03:37 2019 +0100 ++++ b/src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:05:06 2019 +0100 +@@ -26,7 +26,20 @@ + #include + #include + +-#include ++//QHull library ++//Build fix for qhull ; wx defines powerpc without ++//assigning a value, causing build fail on powerpc ++#ifdef __POWERPC__ ++ #pragma push_macro("__POWERPC__") ++ #define __POWERPC__ 1 ++#endif ++extern "C" ++{ ++ #include ++} ++#ifdef __POWERPC__ ++ #pragma pop_macro("__POWERPC__") ++#endif + + using std::vector; + diff --git a/3Depict.spec b/3Depict.spec index 974392f..5c09a83 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -39,6 +39,8 @@ Patch0: %{name}-%{version}-manual-pdf-loc.patch Patch1: %{name}-%{version}-font-path.patch #Qhull dir has changed Patch2: %{name}-%{version}-qhull.patch +#Fix for PPC64 arch +Patch3: %{name}-%{version}-qhull_ppc64le.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -53,6 +55,7 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 +%patch3 %if 0%{?fedora} > 24 # Installation directory has changed @@ -118,6 +121,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sun Aug 11 2019 D Haley - 0.0.22-3 +- Fix for PPC64LE qhull include bug (#1735406) + * Wed Jul 24 2019 Fedora Release Engineering - 0.0.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild