From 01a0727ba93e35401279dee2457be052fe6242c5 Mon Sep 17 00:00:00 2001 From: D Haley Date: Dec 18 2011 18:03:37 +0000 Subject: * Update to upstream 0.0.9 --- diff --git a/.gitignore b/.gitignore index eb8787b..b80ea80 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /3Depict-0.0.6.tar.gz /3Depict-0.0.7.tar.gz /3Depict-0.0.8.tar.gz +/3Depict-0.0.9.tar.gz diff --git a/3Depict-0.0.8-font-path.patch b/3Depict-0.0.8-font-path.patch deleted file mode 100644 index 70252ee..0000000 --- a/3Depict-0.0.8-font-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r dfc04b8b14b2 src/wxcomponents.cpp ---- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 -+++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 -@@ -666,6 +666,7 @@ - //This is a list of possible target dirs to search - //(Oh look Ma, I'm autoconf!) - const char *dirs[] = { ".", -+ "/usr/share/fonts/dejavu", //Fedora - "/usr/share/fonts/truetype", - "/usr/local/share/fonts/truetype", - "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.8-manual-latex.patch b/3Depict-0.0.8-manual-latex.patch deleted file mode 100644 index 423bfb2..0000000 --- a/3Depict-0.0.8-manual-latex.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: 3depict-0.0.8/docs/manual-latex/manual.tex -=================================================================== ---- docs/manual-latex/manual.tex 2011-10-23 16:57:40.000000000 +0100 -+++ docs/manual-latex/manual.tex 2011-10-23 16:57:59.000000000 +0100 -@@ -40,7 +40,7 @@ - \begin{minipage}{0.3\textwidth} - \begin{flushright} \large - \emph{Version:} \\ -- 0.0.7, Jul 2011\end{flushright} -+ 0.0.8, Oct 2011\end{flushright} - \end{minipage} - - \vfill -@@ -499,12 +499,13 @@ - \item \textbf{Reflexive} If selected, the reflexive (exterior) angle will be displayed, rather than the interior angle for the angular measurement. - \item \textbf{Show Angle} Will display the angle measured by the marker in the 3D scene, if selected. - \item \textbf{Text Size} Controls the text size for the angle measurement, if the angle is shown. --\item \textbf{Digit format} Controls the number of significant digits to use, such as '##.##', which will show (for example), 10.78 as the degree value. Use #, or 0-9 as placeholders to specify the format.Allowable decimal separators are period (.) and comma (,). -+\item \textbf{Digit format} Controls the number of significant digits to use, such as '\#\#.\#\#', which will show (for example), 10.78 as the degree value. Use \#, or 0-9 as placeholders to specify the format.Allowable decimal separators are period (.) and comma (,). - - \item \textbf{Sphere size} Sets the size of the sphere widgets which are used to maniupulate and draw the angular measurement positions. - \end{itemize} - \section{Attributions} - -+\begin{itemize} - \item The source code image is a derivative work of \url{http://commons.wikimedia.org/wiki/File:User_icon_2.svg} and \url{http://commons.wikimedia.org/wiki/C_cplusplus_compilation_process.svg}. - - \item The camera image is a derivative work of \url{http://commons.wikimedia.org/wiki/File:Icon_Camera.svg}. diff --git a/3Depict-0.0.8-manual-pdf-loc.patch b/3Depict-0.0.8-manual-pdf-loc.patch deleted file mode 100644 index a819a9c..0000000 --- a/3Depict-0.0.8-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r 634db475333f src/3Depict.cpp ---- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100 -+++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100 -@@ -2142,9 +2142,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(wxStr(s))) -+ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; - - - //If we found it, use the default program associated with that data file diff --git a/3Depict-0.0.8-post-rel-fixes.patch b/3Depict-0.0.8-post-rel-fixes.patch deleted file mode 100644 index 9cbc0bb..0000000 --- a/3Depict-0.0.8-post-rel-fixes.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -r e385d6da2b58 -r 5ebd9b059d6d src/select.h ---- src/select.h Sat Oct 22 20:25:18 2011 +0100 -+++ src/select.h Tue Oct 25 14:52:19 2011 +0100 -@@ -212,8 +212,8 @@ - { - //we found one. - found=true; -+ b=&(bindingVec[ui]); - keyMask=b->getKeyFlags(); -- b=&(bindingVec[ui]); - continue; - } - -@@ -221,8 +221,8 @@ - //by a more complex keymask. - if( (keyMask & b->getKeyFlags() )== keyMask) - { -+ b=&(bindingVec[ui]); - keyMask=b->getKeyFlags(); -- b=&(bindingVec[ui]); - } - } - } -diff -r 594cdcc629c5 -r c2ac9c1d62ca src/filters/transform.cpp ---- src/filters/transform.cpp Wed Oct 26 11:52:36 2011 +0100 -+++ src/filters/transform.cpp Fri Oct 28 21:54:30 2011 +0100 -@@ -1575,9 +1575,9 @@ - int TransformFilter::getRefreshEmitMask() const - { - if(showPrimitive) -+ return STREAM_TYPE_IONS | STREAM_TYPE_DRAW; -+ else - return STREAM_TYPE_IONS; -- else -- return STREAM_TYPE_IONS | STREAM_TYPE_DRAW; - } - - -diff -r c2ac9c1d62ca -r 721a71f7880b src/3Depict.cpp ---- src/3Depict.cpp Fri Oct 28 21:54:30 2011 +0100 -+++ src/3Depict.cpp Fri Oct 28 22:40:28 2011 +0100 -@@ -4438,6 +4438,11 @@ - fileSave->Enable(false); - } - } -+ else -+ { -+ //No file to remove -+ filePath=wxT(""); -+ } - } - else if(autosaveNamePIDMap.size() > 1) - { -@@ -4453,7 +4458,7 @@ - //but wxYES_NO and wxYES|wxNO does not (wxGTK). - wxSingleChoiceDialog *dlg= new wxSingleChoiceDialog(this, - wxTRANS("Multiple auto-save states were found; would you like to restore one?"), -- wxTRANS("Restore auto-save?"),autoSaveChoices,NULL, wxOK|wxCANCEL|wxICON_QUESTION); -+ wxTRANS("Restore auto-save?"),autoSaveChoices,NULL, wxYES_NO|wxYES_DEFAULT|wxICON_QUESTION); - - //Show the dialog to get a choice from the user - if(dlg->ShowModal()==wxID_YES) -@@ -4483,11 +4488,18 @@ - } - - } -+ else -+ { -+ //No file to delete -+ filePath=wxT(""); -+ } - - } - -- -- wxRemoveFile(filePath); -+ -+ // -+ if(filePath != wxT("")) -+ wxRemoveFile(filePath); - - } - wxSize MainWindowFrame::getNiceWindowSize() const -diff -r c2ac9c1d62ca -r 721a71f7880b src/cropPanel.cpp ---- src/cropPanel.cpp Fri Oct 28 21:54:30 2011 +0100 -+++ src/cropPanel.cpp Fri Oct 28 22:40:28 2011 +0100 -@@ -248,6 +248,8 @@ - x=crop[CROP_LEFT]; - y=1.0-crop[CROP_BOTTOM]; - break; -+ default: -+ ASSERT(false); - } - - tmpDist=(xMouse-x)*(xMouse-x) + (yMouse-y)*(yMouse-y); -@@ -570,6 +572,8 @@ - xC=crop[CROP_LEFT]; - yC=1.0-crop[CROP_BOTTOM]; - break; -+ default: -+ ASSERT(false); - } - - xC=xC*(float)w; -diff -r c2ac9c1d62ca -r 721a71f7880b src/voxels.h ---- src/voxels.h Fri Oct 28 21:54:30 2011 +0100 -+++ src/voxels.h Fri Oct 28 22:40:28 2011 +0100 -@@ -1349,7 +1349,7 @@ - kernel.getSize(x,y,z); - half=x/2; - //Kernel needs to be cubic -- ASSERT(x==y && y == z && !(z%2)); -+ ASSERT(x==y && y == z && (z%2)); - - if(boundMode!=BOUND_CLIP) - { -diff -r 4e5ab540702a -r 800d4f0dc5e3 src/prefDialog.cpp ---- src/prefDialog.cpp Fri Oct 28 23:20:06 2011 +0100 -+++ src/prefDialog.cpp Sat Oct 29 00:10:49 2011 +0100 -@@ -172,9 +172,9 @@ - - //Transfer the movement rates from class to the slider - ASSERT(mouseZoomRatePercent >=sliderCamZoomRate->GetMin() && -- mouseZoomRatePercent < sliderCamZoomRate->GetMax()); -+ mouseZoomRatePercent <=sliderCamZoomRate->GetMax()); - ASSERT(mouseMoveRatePercent >=sliderCamMoveRate->GetMin() && -- mouseMoveRatePercent < sliderCamMoveRate->GetMax()); -+ mouseMoveRatePercent <=sliderCamMoveRate->GetMax()); - - - sliderCamZoomRate->SetValue(mouseZoomRatePercent); diff --git a/3Depict-0.0.9-font-path.patch b/3Depict-0.0.9-font-path.patch new file mode 100644 index 0000000..70252ee --- /dev/null +++ b/3Depict-0.0.9-font-path.patch @@ -0,0 +1,11 @@ +diff -r dfc04b8b14b2 src/wxcomponents.cpp +--- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 ++++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 +@@ -666,6 +666,7 @@ + //This is a list of possible target dirs to search + //(Oh look Ma, I'm autoconf!) + const char *dirs[] = { ".", ++ "/usr/share/fonts/dejavu", //Fedora + "/usr/share/fonts/truetype", + "/usr/local/share/fonts/truetype", + "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.9-manual-pdf-loc.patch b/3Depict-0.0.9-manual-pdf-loc.patch new file mode 100644 index 0000000..a819a9c --- /dev/null +++ b/3Depict-0.0.9-manual-pdf-loc.patch @@ -0,0 +1,16 @@ +diff -r 634db475333f src/3Depict.cpp +--- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100 ++++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100 +@@ -2142,9 +2142,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(wxStr(s))) ++ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; + + + //If we found it, use the default program associated with that data file diff --git a/3Depict.spec b/3Depict.spec index bd72f0b..64ffbf7 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.8 -Release: 3%{?dist} +Version: 0.0.9 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -33,15 +33,9 @@ BuildRequires: tex(latex) BuildRequires: qhull-devel #Fedora specific PDF dir. -Patch0: %{name}-0.0.8-manual-pdf-loc.patch +Patch0: %{name}-0.0.9-manual-pdf-loc.patch #Fedora specific font dir -Patch1: %{name}-0.0.8-font-path.patch - -#Fix latex manual version # and syntax -Patch2: %{name}-0.0.8-manual-latex.patch - -#Fix bugs identified post 0.0.8 release -Patch3: %{name}-0.0.8-post-rel-fixes.patch +Patch1: %{name}-0.0.9-font-path.patch %description This program is designed to help users visualize and analyze 3D point clouds @@ -55,16 +49,14 @@ useful for general scalar valued point data purposes. %patch0 %patch1 -%patch2 -%patch3 + +#Fix permissions erorrs in tarball +chmod a-x src/*.cpp src/*.h %build -#--enable-openmp-parallel does not work -- there is a bug in the -# tr1 headers with -D_GLIBCXX_PARALLEL . Lets drop that and only use -# -fopenmp -export CFLAGS="$RPM_OPT_FLAGS -fopenmp" -export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp" -%configure --disable-debug-checks +#export CFLAGS="$RPM_OPT_FLAGS -fopenmp" +#export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp" +%configure --disable-debug-checks --enable-openmp-parallel make %{?_smp_mflags} pushd docs/manual-latex @@ -80,7 +72,7 @@ make install DESTDIR=%{buildroot} # Install the textures mkdir -p %{buildroot}%{_datadir}/%{name}/textures -cp -p src/textures/textures/* %{buildroot}%{_datadir}/%{name}/textures +cp -p src/textures/* %{buildroot}%{_datadir}/%{name}/textures #Install the manpage @@ -90,7 +82,7 @@ desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ packaging/%{name}.desktop mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -Dp -m 644 src/tex-source/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg +install -Dp -m 644 src/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg #install language files #-- @@ -100,7 +92,7 @@ mv locales/de_DE/ locales/de/ mkdir -p %{buildroot}/%{_datadir}/locale/ cp -R locales/* %{buildroot}/%{_datadir}/locale/ -#Restore the internal build's locale namign +#Restore the internal build's locale naming mv locales/de/ locales/de_DE/ #-- @@ -129,6 +121,9 @@ rm -rf %{buildroot} %changelog +* Tue Dec 06 2011 Adam Jackson - 0.0.9-1 +- Rebuild for new libpng + * Tue Dec 06 2011 Adam Jackson - 0.0.8-3 - Rebuild for new libpng diff --git a/sources b/sources index 8dd6c27..2959acd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -832740cc7bf7cc89cd94dbf082532584 3Depict-0.0.8.tar.gz +9be57d2690cfe81398362f371fc681e3 3Depict-0.0.9.tar.gz