Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d605fd6c2a | ||
|
|
f081a732cc | ||
|
|
ab28927c35 |
8 changed files with 388 additions and 1 deletions
18
.gitignore
vendored
Normal file
18
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
/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
|
||||
/3Depict-0.0.21.tar.gz
|
||||
26
3Depict-0.0.21-font-path.patch
Normal file
26
3Depict-0.0.21-font-path.patch
Normal file
|
|
@ -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 "".
|
||||
|
||||
15
3Depict-0.0.21-manual-pdf-loc.patch
Normal file
15
3Depict-0.0.21-manual-pdf-loc.patch
Normal file
|
|
@ -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())
|
||||
12
3Depict-0.0.21-qhull.patch
Normal file
12
3Depict-0.0.21-qhull.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -r 031db7992cf7 src/backend/filters/algorithms/convexHull.h
|
||||
--- src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:27:02 2018 +0000
|
||||
+++ src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:34:47 2018 +0000
|
||||
@@ -35,7 +35,7 @@
|
||||
#endif
|
||||
extern "C"
|
||||
{
|
||||
- #include <qhull/qhull_a.h>
|
||||
+ #include <libqhull/qhull_a.h>
|
||||
}
|
||||
#ifdef __POWERPC__
|
||||
#pragma pop_macro("__POWERPC__")
|
||||
21
3Depict-0.0.21-wayland.patch
Normal file
21
3Depict-0.0.21-wayland.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff -r 13113574c8fc src/3Depict.cpp
|
||||
--- src/3Depict.cpp Sun Aug 11 23:16:43 2019 +0100
|
||||
+++ src/3Depict.cpp Sun Aug 11 23:17:35 2019 +0100
|
||||
@@ -76,6 +76,17 @@
|
||||
|
||||
};
|
||||
|
||||
+//Wayland workaround - wx bug 17702
|
||||
+#ifdef __WXGTK3__
|
||||
+struct ForceX11 {
|
||||
+ ForceX11(){
|
||||
+ setenv("GDK_BACKEND","x11",1);
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct ForceX11 forcex11;
|
||||
+#endif
|
||||
+
|
||||
//Check version is in place because wxT is deprecated for wx 2.9
|
||||
//Command line parameter table
|
||||
static const wxCmdLineEntryDesc g_cmdLineDesc [] =
|
||||
295
3Depict.spec
Normal file
295
3Depict.spec
Normal file
|
|
@ -0,0 +1,295 @@
|
|||
Name: 3Depict
|
||||
Version: 0.0.21
|
||||
Release: 3%{?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: gcc-c++
|
||||
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
|
||||
#Qhull dir has changed
|
||||
Patch2: %{name}-%{version}-qhull.patch
|
||||
#wxGLCanvas not supported under wayland.
|
||||
# wx bug 17702
|
||||
Patch3: %{name}-%{version}-wayland.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
|
||||
%patch3
|
||||
|
||||
%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 Aug 11 2019 D Haley <mycae(a!t)gmx.com> - 0.0.21-3
|
||||
- Add workaround for crash under wayland (wx bug 17702)
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Feb 10 2018 D Haley <mycae(a!t)gmx.com> - 0.0.21-1
|
||||
- Update to 0.0.21
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.20-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Jan 14 2018 D Haley <mycae(a!t)gmx.com> - 0.0.20-6
|
||||
- Bump for MGL rebuild
|
||||
|
||||
* Thu Oct 12 2017 D Haley <mycae(a!t)gmx.com> - 0.0.20-5
|
||||
- Bump for GSL rebuild
|
||||
- Add fixes for s390/ppc64
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.20-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.20-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.20-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Sun Feb 05 2017 D Haley <mycae(a!t)gmx.com> - 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 <mycae(a!t)gmx.com> - 0.0.19-2
|
||||
- Rebuild for libmgl bump
|
||||
|
||||
* Wed Jun 01 2016 D Haley <mycae(a!t)gmx.com> - 0.0.19-1
|
||||
- Update to 0.0.19
|
||||
- Remove gcc patch, fixed upstream
|
||||
- Add upstream patch
|
||||
|
||||
* Fri Apr 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.0.18-7
|
||||
- Rebuild for qhull-2015.2-1.
|
||||
- Reflect qhull_a.h's location having changed.
|
||||
|
||||
* Tue Mar 8 2016 Orion Poplawski <orion@cora.nwra.com> - 0.0.18-6
|
||||
- Add patch for fix compilation with gcc 6
|
||||
|
||||
* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 0.0.18-5
|
||||
- Rebuild for gsl 2.1
|
||||
- Cleanup spec
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.18-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sun Nov 29 2015 Kalev Lember <klember@redhat.com> - 0.0.18-3
|
||||
- Rebuilt for libmgl soname bump
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri May 01 2015 D Haley <mycae(a!t)gmx.com> - 0.0.18-1
|
||||
- Update to 0.0.18
|
||||
|
||||
* Sat Oct 11 2014 D Haley <mycae(a!t)gmx.com> - 0.0.17-2
|
||||
- Rebuild for mathgl 2.3
|
||||
|
||||
* Sun Sep 28 2014 D Haley <mycae(a!t)gmx.com> - 0.0.17-1
|
||||
- Update to 0.0.17
|
||||
|
||||
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Apr 26 2014 D Haley <mycae(a!t)gmx.com> - 0.0.16-1
|
||||
- Update to 0.0.16
|
||||
|
||||
* Wed Feb 12 2014 D Haley <mycae(a!t)gmx.com> - 0.0.15-4
|
||||
- Rebuild for mgl
|
||||
|
||||
* Wed Feb 05 2014 D Haley <mycae(a!t)gmx.com> - 0.0.15-3
|
||||
- Rebuild for new mgl
|
||||
- Add upstream patches
|
||||
|
||||
* Sun Jan 26 2014 D Haley <mycae(a!t)gmx.com> - 0.0.15-2
|
||||
- Rebuild for new mgl
|
||||
|
||||
* Sun Dec 01 2013 D Haley <mycae(a!t)gmx.com> - 0.0.15-1
|
||||
- Update to 0.0.15
|
||||
|
||||
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2013 D Haley <mycae(a!t)gmx.com> - 0.0.14-1
|
||||
- Update to 0.0.14
|
||||
|
||||
* Tue Jun 25 2013 D Haley <mycae(a!t)gmx.com> - 0.0.13-2
|
||||
- Enable mathgl2
|
||||
|
||||
* Fri Apr 12 2013 D Haley <mycae(a!t)gmx.com> - 0.0.13-1
|
||||
- Update to 0.0.13
|
||||
|
||||
* Sat Mar 23 2013 D Haley <mycae(a!t)gmx.com> - 0.0.12-4
|
||||
- Add aarch 64 patch for bug 924960, until next version
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Dec 9 2012 D Haley <mycae(a!t)yahoo.com> - 0.0.12-2
|
||||
- Import bugfixes from upstream for plot UI and crash fixes
|
||||
|
||||
* Sun Nov 25 2012 D Haley <mycae(a!t)yahoo.com> - 0.0.12-1
|
||||
- Update to 0.0.12
|
||||
|
||||
* Mon Apr 2 2012 D Haley <mycae(a!t)yahoo.com> - 0.0.10-1
|
||||
- Update to 0.0.10
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.9-4
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Thu Jan 12 2012 D Haley <mycae(a!t)yahoo.com> - 0.0.9-3
|
||||
- Patch to fix FTFBS for gcc 4.7
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Sat Dec 17 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.9-1
|
||||
- Update to 0.0.9
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.0.8-3
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Sat Oct 29 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.8-2
|
||||
- Post release fixes for various crash bugs
|
||||
|
||||
* Sun Oct 23 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.8-1
|
||||
- Update to 0.0.8
|
||||
|
||||
* Sun Aug 14 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.7-1
|
||||
- Update to 0.0.7
|
||||
|
||||
* Fri May 20 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.6-1
|
||||
- Update to 0.0.6
|
||||
|
||||
* Sun Mar 27 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.5-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Mar 13 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-3
|
||||
- Patch opengl startup code -- peek at gl context. Possible fix for bug 684390
|
||||
|
||||
* Sat Feb 12 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-2
|
||||
- Fix bug 677016 - 3Depict no built with rpm opt flags
|
||||
|
||||
* Sat Jan 22 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-1
|
||||
- Update to 0.0.4
|
||||
|
||||
* Fri Nov 26 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.3-1
|
||||
- Update to 0.0.3
|
||||
|
||||
* Tue Oct 5 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.2-3
|
||||
- Use tex(latex) virtual package in preference to texlive-latex
|
||||
|
||||
* Mon Oct 4 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.2-2
|
||||
- Add latex build for manual
|
||||
|
||||
* Sat Sep 25 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.2-1
|
||||
- Update to 0.0.2
|
||||
- Address comments in package review
|
||||
|
||||
* Sun Aug 08 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.1-1
|
||||
- Initial package
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
Orphaned for 6+ weeks
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
SHA512 (3Depict-0.0.21.tar.gz) = 7f9ed4813675c7977df9fd5cc83af3c03e2c91f8d724ebe497d120bd5db0b25843bfdb8d01d495be08f86ed63117755f87be9a81bb4c6b48246c9b7144dec984
|
||||
Reference in a new issue