diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7909acc..0000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -/3Depict-0.0.2.tar.gz -/3Depict-0.0.3.tar.gz -/3Depict-0.0.6.tar.gz -/3Depict-0.0.7.tar.gz -/3Depict-0.0.8.tar.gz -/3Depict-0.0.9.tar.gz -/3Depict-0.0.10.tar.gz -/3Depict-0.0.11.tar.gz -/3Depict-0.0.12.tar.gz -/3Depict-0.0.13.tar.gz -/3Depict-0.0.14.tar.gz -/3Depict-0.0.15.tar.gz -/3Depict-0.0.16.tar.gz -/3Depict-0.0.17.tar.gz -/3Depict-0.0.18.tar.gz diff --git a/3Depict-0.0.18-font-path.patch b/3Depict-0.0.18-font-path.patch deleted file mode 100644 index 02f52fc..0000000 --- a/3Depict-0.0.18-font-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 @@ - //(Oh look Ma, I'm autoconf!) - - const char *dirs[] = { ".", -- "/usr/share/fonts/truetype", //Old debian -+ "/usr/local/share/fonts/truetype", // User fonts - "/usr/share/fonts/truetype/freefont", // New debian - "/usr/share/fonts/truetype/ttf-dejavu", //New debian -- "/usr/local/share/fonts/truetype", // User fonts -+ "/usr/share/fonts/truetype", //Old debian -+ "/usr/share/fonts/dejavu", //Fedora - "/usr/X11R6/lib/X11/fonts/truetype", - "/usr/X11R6/lib64/X11/fonts/truetype", -- "/usr/lib/X11/fonts/truetype",// Fedora 32 -- "/usr/lib64/X11/fonts/truetype", //Fedora 64 -- "/usr/local/lib/X11/fonts/truetype", // Fedora 32 new -- "/usr/local/lib64/X11/fonts/truetype",// Fedora 64 new -+ "/usr/lib/X11/fonts/truetype", -+ "/usr/lib64/X11/fonts/truetype", -+ "/usr/local/lib/X11/fonts/truetype", -+ "/usr/local/lib64/X11/fonts/truetype", - "", - }; //MUST end with "". - diff --git a/3Depict-0.0.18-manual-pdf-loc.patch b/3Depict-0.0.18-manual-pdf-loc.patch deleted file mode 100644 index 31178af..0000000 --- a/3Depict-0.0.18-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 @@ - string s; - s=locateDataFile("3Depict-manual.pdf"); - -- //Also Debian makes us use the lowercase "D", so check there too. -- if(!s.size()) -- s=locateDataFile("3depict-manual.pdf"); -+ //Also Fedora has diff dir -+ if(!wxFileExists(s)) -+ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; - - //FIXME: under windows, currently we use "manual.pdf" - if(!s.size()) 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-gcc6.patch b/3Depict-gcc6.patch deleted file mode 100644 index 96e9bd4..0000000 --- a/3Depict-gcc6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up 3Depict-0.0.18/src/common/stringFuncs.cpp.gcc6 3Depict-0.0.18/src/common/stringFuncs.cpp ---- 3Depict-0.0.18/src/common/stringFuncs.cpp.gcc6 2016-03-08 19:17:26.511474604 -0700 -+++ 3Depict-0.0.18/src/common/stringFuncs.cpp 2016-03-08 19:17:47.243499854 -0700 -@@ -229,7 +229,7 @@ bool genRandomFilename(std::string &s,bo - retry++; - } - while(!f && (retry < MAX_RETRY) ); -- return f; -+ return static_cast(f); - - } - diff --git a/3Depict.spec b/3Depict.spec deleted file mode 100644 index 7427521..0000000 --- a/3Depict.spec +++ /dev/null @@ -1,238 +0,0 @@ -Name: 3Depict -Version: 0.0.18 -Release: 6%{?dist} -Summary: Valued 3D point cloud visualization and analysis -Group: Applications/Engineering - - -License: GPLv3+ -URL: http://threedepict.sourceforge.net -Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz - - -#Mathgl for plotting -BuildRequires: mathgl-devel -#Mesa for GLU -BuildRequires: libGL-devel -#Libxml2 for file parsing -BuildRequires: libxml2-devel -#FTGL for 3d fonts -BuildRequires: ftgl-devel -#libpng for textures -BuildRequires: libpng-devel -#Desktop file utils for installing desktop file -BuildRequires: desktop-file-utils -#WX widgets -BuildRequires: wxGTK3-devel -#Vigra, for voxelisation -BuildRequires: vigra-devel - -#PDF latex build -#BuildRequires: tex(latex) - -#Required for surface removal algorithms -BuildRequires: qhull-devel - -#Fedora specific PDF dir. -Patch0: %{name}-%{version}-manual-pdf-loc.patch -#Fedora specific font dir -Patch1: %{name}-%{version}-font-path.patch -#Fix gcc6 compilation -Patch2: %{name}-gcc6.patch - - -%description -This software is designed to help users visualize and analyze 3D point clouds -with an associated real value, in a fast and flexible fashion. It is -specifically targeted to atom probe tomography applications, but may be -useful for general scalar valued point data purposes. - -%prep - -%setup -q - -%patch0 -%patch1 -%patch2 -p1 -b .gcc6 - -%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 -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} - -# Install the textures -mkdir -p %{buildroot}%{_datadir}/%{name}/textures -cp -p data/textures/*png %{buildroot}%{_datadir}/%{name}/textures/ - - -#Install the manpage -install -Dp -m 644 packaging/manpage/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 - -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - packaging/%{name}.desktop -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -Dp -m 644 data/textures/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg - -#install language files -#-- -#Remap locale names -mv locales/de_DE/ locales/de/ - -mkdir -p %{buildroot}/%{_datadir}/locale/ -cp -R locales/* %{buildroot}/%{_datadir}/locale/ - -#Restore the internal build's locale naming -mv locales/de/ locales/de_DE/ -#-- - - -#Move the documentation such that it is picked up by the doc macro -mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf - -#Locale stuff -%find_lang %{name} - - -%files -f %{name}.lang -%license COPYING -%doc AUTHORS ChangeLog README TODO %{name}-%{version}-manual.pdf -%{_bindir}/%{name} -%dir %{_datadir}/%{name}/ -%dir %{_datadir}/%{name}/textures -%{_datadir}/%{name}/textures/*.png -%{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/%{name}.1.* -%{_datadir}/pixmaps/*.svg - - -%changelog -* Tue Mar 8 2016 Orion Poplawski - 0.0.18-6 -- Add patch for fix compilation with gcc 6 - -* Mon Feb 22 2016 Orion Poplawski - 0.0.18-5 -- Rebuild for gsl 2.1 -- Cleanup spec - -* Wed Feb 03 2016 Fedora Release Engineering - 0.0.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Nov 29 2015 Kalev Lember - 0.0.18-3 -- Rebuilt for libmgl soname bump - -* Tue Jun 16 2015 Fedora Release Engineering - 0.0.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 01 2015 D Haley - 0.0.18-1 -- Update to 0.0.18 - -* Sat Oct 11 2014 D Haley - 0.0.17-2 -- Rebuild for mathgl 2.3 - -* Sun Sep 28 2014 D Haley - 0.0.17-1 -- Update to 0.0.17 - -* Fri Jun 06 2014 Fedora Release Engineering - 0.0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Apr 26 2014 D Haley - 0.0.16-1 -- Update to 0.0.16 - -* Wed Feb 12 2014 D Haley - 0.0.15-4 -- Rebuild for mgl - -* Wed Feb 05 2014 D Haley - 0.0.15-3 -- Rebuild for new mgl -- Add upstream patches - -* Sun Jan 26 2014 D Haley - 0.0.15-2 -- Rebuild for new mgl - -* Sun Dec 01 2013 D Haley - 0.0.15-1 -- Update to 0.0.15 - -* Fri Aug 02 2013 Fedora Release Engineering - 0.0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 20 2013 D Haley - 0.0.14-1 -- Update to 0.0.14 - -* Tue Jun 25 2013 D Haley - 0.0.13-2 -- Enable mathgl2 - -* Fri Apr 12 2013 D Haley - 0.0.13-1 -- Update to 0.0.13 - -* Sat Mar 23 2013 D Haley - 0.0.12-4 -- Add aarch 64 patch for bug 924960, until next version - -* Wed Feb 13 2013 Fedora Release Engineering - 0.0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Dec 9 2012 D Haley - 0.0.12-2 -- Import bugfixes from upstream for plot UI and crash fixes - -* Sun Nov 25 2012 D Haley - 0.0.12-1 -- Update to 0.0.12 - -* Mon Apr 2 2012 D Haley - 0.0.10-1 -- Update to 0.0.10 - -* Tue Feb 28 2012 Fedora Release Engineering - 0.0.9-4 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 D Haley - 0.0.9-3 -- Patch to fix FTFBS for gcc 4.7 - -* Thu Jan 12 2012 Fedora Release Engineering - 0.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Dec 17 2011 D Haley - 0.0.9-1 -- Update to 0.0.9 - -* Tue Dec 06 2011 Adam Jackson - 0.0.8-3 -- Rebuild for new libpng - -* Sat Oct 29 2011 D Haley - 0.0.8-2 -- Post release fixes for various crash bugs - -* Sun Oct 23 2011 D Haley - 0.0.8-1 -- Update to 0.0.8 - -* Sun Aug 14 2011 D Haley - 0.0.7-1 -- Update to 0.0.7 - -* Fri May 20 2011 D Haley - 0.0.6-1 -- Update to 0.0.6 - -* Sun Mar 27 2011 D Haley - 0.0.5-1 -- New upstream release - -* Sun Mar 13 2011 D Haley - 0.0.4-3 -- Patch opengl startup code -- peek at gl context. Possible fix for bug 684390 - -* Sat Feb 12 2011 D Haley - 0.0.4-2 -- Fix bug 677016 - 3Depict no built with rpm opt flags - -* Sat Jan 22 2011 D Haley - 0.0.4-1 -- Update to 0.0.4 - -* Fri Nov 26 2010 D Haley - 0.0.3-1 -- Update to 0.0.3 - -* Tue Oct 5 2010 D Haley - 0.0.2-3 -- Use tex(latex) virtual package in preference to texlive-latex - -* Mon Oct 4 2010 D Haley - 0.0.2-2 -- Add latex build for manual - -* Sat Sep 25 2010 D Haley - 0.0.2-1 -- Update to 0.0.2 -- Address comments in package review - -* Sun Aug 08 2010 D Haley - 0.0.1-1 -- Initial package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 187026f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -feddf0bf7b81d02e064a2b7cfe81aaeb 3Depict-0.0.18.tar.gz