diff --git a/.gitignore b/.gitignore index 7909acc..db1a723 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /3Depict-0.0.16.tar.gz /3Depict-0.0.17.tar.gz /3Depict-0.0.18.tar.gz +/3Depict-0.0.19.tar.gz +/3Depict-0.0.20.tar.gz diff --git a/3Depict-0.0.18-upstream.patch b/3Depict-0.0.18-upstream.patch deleted file mode 100644 index f52f426..0000000 --- a/3Depict-0.0.18-upstream.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff -r 7510fdcc8b8a -r 185ccbce5421 src/3Depict.cpp ---- src/3Depict.cpp Mon Aug 25 14:41:48 2014 +0100 -+++ src/3Depict.cpp Mon Aug 25 14:42:29 2014 +0100 -@@ -39,6 +39,12 @@ - - class threeDepictApp: public wxApp { - private: -+#ifndef DEBUG -+ //instance of this class suppresses internal wx error dialogs. -+ // these are a nuisance in release code, as recovered errors often annoy the user -+ wxLogNull nullifyLogs; -+#endif -+ - MainWindowFrame* MainFrame ; - wxArrayString commandLineFiles; - wxLocale* usrLocale; -@@ -62,9 +68,6 @@ - void MacReopenFile(const wxString & fileName); - #endif - --#ifdef DEBUG -- void setEventloggerFile(const char *file); --#endif - }; - - //Check version is in place because wxT is deprecated for wx 2.9 -diff -r 185ccbce5421 -r c8ff86119e58 src/backend/filters/clusterAnalysis.cpp ---- src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:42:29 2014 +0100 -+++ src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:43:10 2014 +0100 -@@ -264,7 +264,7 @@ - - ClusterAnalysisFilter::ClusterAnalysisFilter() : algorithm(CLUSTER_LINK_ERODE), - enableCoreClassify(false), coreDist(0.0f), coreKNN(1), linkDist(0.5f), -- enableBulkLink(false), bulkLink(1), enableErosion(false), dErosion(0.25), -+ enableBulkLink(false), bulkLink(0.25), enableErosion(false), dErosion(0.25), - wantClusterID(false), wantCropSize(false), nMin(0),nMax(std::numeric_limits::max()), - wantClusterSizeDist(false),logClusterSize(false), - wantClusterComposition(true),normaliseComposition(true), -diff -r c8ff86119e58 -r 55ec5e056846 src/gui/mainFrame.cpp ---- src/gui/mainFrame.cpp Mon Aug 25 14:43:10 2014 +0100 -+++ src/gui/mainFrame.cpp Mon Aug 25 14:51:53 2014 +0100 -@@ -464,7 +464,7 @@ - fileExport->Append(ID_FILE_EXPORT_IMAGE, TRANS("&Image...\tCtrl+I"), TRANS("Export Current 3D View"), wxITEM_NORMAL); - fileExport->Append(ID_FILE_EXPORT_IONS, TRANS("Ion&s...\tCtrl+N"), TRANS("Export Ion Data"), wxITEM_NORMAL); - fileExport->Append(ID_FILE_EXPORT_RANGE, TRANS("Ran&ges...\tCtrl+G"), TRANS("Export Range Data"), wxITEM_NORMAL); -- fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+A"), TRANS("Export Animated Filter"), wxITEM_NORMAL); -+ fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+T"), TRANS("Export Animated Filter"), wxITEM_NORMAL); - fileExport->Append(ID_FILE_EXPORT_ANIMATION, TRANS("Ani&mate Camera...\tCtrl+M"), TRANS("Export Animated Camera"), wxITEM_NORMAL); - fileExport->Append(ID_FILE_EXPORT_PACKAGE, TRANS("Pac&kage...\tCtrl+K"), TRANS("Export analysis package"), wxITEM_NORMAL); - -diff -r 9d545342c3ad -r 3c853d1f5af7 src/backend/filters/externalProgram.cpp ---- src/backend/filters/externalProgram.cpp Mon Aug 25 14:52:42 2014 +0100 -+++ src/backend/filters/externalProgram.cpp Mon Aug 25 14:53:04 2014 +0100 -@@ -551,7 +551,7 @@ - - p.name=TRANS("Work Dir"); - p.data= workingDir; -- p.type=PROPERTY_TYPE_STRING; -+ p.type=PROPERTY_TYPE_DIR; - p.helpText=TRANS("Directory to run the command in"); - p.key=EXTERNALPROGRAM_KEY_WORKDIR; - propertyList.addProperty(p,curGroup); -diff -r 9d545342c3ad -r 3c853d1f5af7 src/common/constants.h ---- src/common/constants.h Mon Aug 25 14:52:42 2014 +0100 -+++ src/common/constants.h Mon Aug 25 14:53:04 2014 +0100 -@@ -57,6 +57,7 @@ - PROPERTY_TYPE_POINT3D, - PROPERTY_TYPE_CHOICE, - PROPERTY_TYPE_FILE, -+ PROPERTY_TYPE_DIR, - PROPERTY_TYPE_ENUM_END //Not a prop, just end of enum - }; - -diff -r 9d545342c3ad -r 3c853d1f5af7 src/wx/propertyGridUpdater.cpp ---- src/wx/propertyGridUpdater.cpp Mon Aug 25 14:52:42 2014 +0100 -+++ src/wx/propertyGridUpdater.cpp Mon Aug 25 14:53:04 2014 +0100 -@@ -61,7 +61,7 @@ - g->Append(new wxPropertyCategory(string("") + title,title)); - - -- //Set the children of thies property -+ //Set the children of this property - for(size_t uj=0;ujSetHelpString(fp.helpText); - -+ //add the property to the grid - g->Append(pgp); - - switch(fp.type) - { - case PROPERTY_TYPE_BOOL: - { -+ //if a bool property, use a checkbox to edit - g->SetPropertyEditor(pgp,wxPGEditor_CheckBox); - break; - } -diff -r 7372047ee6f9 src/common/basics.cpp ---- src/common/basics.cpp Sun Aug 03 16:58:06 2014 -0400 -+++ src/common/basics.cpp Sun Aug 03 17:01:04 2014 -0400 -@@ -1471,6 +1471,21 @@ - return 0; - } - -+bool isNotDirectory(const char *filename) -+{ -+ struct stat statbuf; -+ -+ if(stat(filename,&statbuf) == -1) -+ return false; -+ -+ return (statbuf.st_mode !=S_IFDIR); -+} -+ -+bool rmFile(const std::string &filename) -+{ -+ return remove(filename.c_str()) == 0; -+} -+ - #ifdef DEBUG - bool isValidXML(const char *filename) - { -@@ -1503,27 +1518,6 @@ - return true; - } - --#if !defined(__WIN32__) && !defined(__WIN64) - --bool isNotDirectory(const char *filename) --{ -- struct stat statbuf; -- -- if(stat(filename,&statbuf) == -1) -- return false; -- -- return (statbuf.st_mode !=S_IFDIR); --} -- --bool rmFile(const std::string &filename) --{ -- return remove(filename.c_str()) == 0; --} --#elif defined(__WIN32) || defined(__WIN64) --bool rmFile(const std::string &filename) --{ -- return DeleteFile((const wchar_t*)filename.c_str()) == 0; --} --#endif - - #endif 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-0.0.18-font-path.patch b/3Depict-0.0.20-font-path.patch similarity index 83% rename from 3Depict-0.0.18-font-path.patch rename to 3Depict-0.0.20-font-path.patch index 02f52fc..9a52b58 100644 --- a/3Depict-0.0.18-font-path.patch +++ b/3Depict-0.0.20-font-path.patch @@ -1,7 +1,6 @@ -diff -r 7abb69436c2b src/wx/wxcomponents.cpp ---- src/wx/wxcomponents.cpp Sat Aug 02 05:39:24 2014 -0400 -+++ src/wx/wxcomponents.cpp Sat Aug 02 05:40:51 2014 -0400 -@@ -547,16 +547,17 @@ +--- src/wx/wxcomponents.cpp ++++ src/wx/wxcomponents.cpp +@@ -555,16 +555,17 @@ std::string TTFFinder::nxFindFont(const char *fontFile) //(Oh look Ma, I'm autoconf!) const char *dirs[] = { ".", diff --git a/3Depict-0.0.18-manual-pdf-loc.patch b/3Depict-0.0.20-manual-pdf-loc.patch similarity index 67% rename from 3Depict-0.0.18-manual-pdf-loc.patch rename to 3Depict-0.0.20-manual-pdf-loc.patch index 31178af..b2d23c4 100644 --- a/3Depict-0.0.18-manual-pdf-loc.patch +++ b/3Depict-0.0.20-manual-pdf-loc.patch @@ -1,7 +1,6 @@ -diff -r 7abb69436c2b src/gui/mainFrame.cpp ---- src/gui/mainFrame.cpp Sat Aug 02 05:39:24 2014 -0400 -+++ src/gui/mainFrame.cpp Sat Aug 02 05:40:32 2014 -0400 -@@ -2840,9 +2840,9 @@ +--- src/gui/mainFrame.cpp ++++ src/gui/mainFrame.cpp +@@ -2904,9 +2904,9 @@ void MainWindowFrame::OnHelpHelp(wxCommandEvent &event) string s; s=locateDataFile("3Depict-manual.pdf"); diff --git a/3Depict.spec b/3Depict.spec index 7427521..102296d 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.18 -Release: 6%{?dist} +Version: 0.0.20 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -37,9 +37,9 @@ BuildRequires: qhull-devel Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir Patch1: %{name}-%{version}-font-path.patch -#Fix gcc6 compilation -Patch2: %{name}-gcc6.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 @@ -53,12 +53,20 @@ useful for general scalar valued point data purposes. %patch0 %patch1 -%patch2 -p1 -b .gcc6 +%patch2 + +%if 0%{?fedora} > 24 +# Installation directory has changed +sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \ + src/backend/filters/filterCommon.h \ + src/backend/filters/algorithms/spatial.cpp \ + configure configure.ac +# Avoid rerunning the autotools +touch -r aclocal.m4 configure configure.ac +%endif %build -#Due to bug 1077718, wx-config cannot be specified, due to -# wx2/wx3 conflict. -%configure --disable-debug-checks --enable-openmp-parallel --with-wx-config=wx-config-3.0 +%configure --disable-debug-checks --enable-openmp-parallel make %{?_smp_mflags} %install @@ -111,6 +119,22 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sun Feb 05 2017 D Haley - 0.0.20-1 +- Update to 0.0.20 +- Do not specify wx-config-3.0 (bug in wx, 1077718, fixed) +======= +* Sat Jan 14 2017 D Haley - 0.0.19-2 +- Rebuild for libmgl bump + +* Wed Jun 01 2016 D Haley - 0.0.19-1 +- Update to 0.0.19 +- Remove gcc patch, fixed upstream +- Add upstream patch + +* Fri Apr 29 2016 Ralf Corsépius - 0.0.18-7 +- Rebuild for qhull-2015.2-1. +- Reflect qhull_a.h's location having changed. + * Tue Mar 8 2016 Orion Poplawski - 0.0.18-6 - Add patch for fix compilation with gcc 6 @@ -236,3 +260,4 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf * Sun Aug 08 2010 D Haley - 0.0.1-1 - Initial package + diff --git a/sources b/sources index 187026f..2039ffd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -feddf0bf7b81d02e064a2b7cfe81aaeb 3Depict-0.0.18.tar.gz +SHA512 (3Depict-0.0.20.tar.gz) = e9a68e57c56a0fc9246a70b0bb031a40c54726ba38663fddc9f92995826bc17641fa6cb6872773de39b762e340f03f114a1509ed640bcfc06b266260f1e17654