diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db1a723 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +/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 +/3Depict-0.0.19.tar.gz +/3Depict-0.0.20.tar.gz 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.20-font-path.patch b/3Depict-0.0.20-font-path.patch new file mode 100644 index 0000000..9a52b58 --- /dev/null +++ b/3Depict-0.0.20-font-path.patch @@ -0,0 +1,26 @@ +--- 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[] = { ".", +- "/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.20-manual-pdf-loc.patch b/3Depict-0.0.20-manual-pdf-loc.patch new file mode 100644 index 0000000..b2d23c4 --- /dev/null +++ b/3Depict-0.0.20-manual-pdf-loc.patch @@ -0,0 +1,15 @@ +--- src/gui/mainFrame.cpp ++++ src/gui/mainFrame.cpp +@@ -2904,9 +2904,9 @@ void MainWindowFrame::OnHelpHelp(wxCommandEvent &event) + 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.spec b/3Depict.spec new file mode 100644 index 0000000..102296d --- /dev/null +++ b/3Depict.spec @@ -0,0 +1,263 @@ +Name: 3Depict +Version: 0.0.20 +Release: 1%{?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 +#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 +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 + +%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 +%configure --disable-debug-checks --enable-openmp-parallel +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 +* 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 + +* 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 deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..2039ffd --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (3Depict-0.0.20.tar.gz) = e9a68e57c56a0fc9246a70b0bb031a40c54726ba38663fddc9f92995826bc17641fa6cb6872773de39b762e340f03f114a1509ed640bcfc06b266260f1e17654