diff --git a/.gitignore b/.gitignore index b80ea80..f82ff90 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /3Depict-0.0.7.tar.gz /3Depict-0.0.8.tar.gz /3Depict-0.0.9.tar.gz +/3Depict-0.0.10.tar.gz diff --git a/3Depict-0.0.10-1.fc18.src.rpm b/3Depict-0.0.10-1.fc18.src.rpm new file mode 100644 index 0000000..bea8ce5 Binary files /dev/null and b/3Depict-0.0.10-1.fc18.src.rpm differ diff --git a/3Depict-0.0.10-font-path.patch b/3Depict-0.0.10-font-path.patch new file mode 100644 index 0000000..70252ee --- /dev/null +++ b/3Depict-0.0.10-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.10-manual-pdf-loc.patch b/3Depict-0.0.10-manual-pdf-loc.patch new file mode 100644 index 0000000..a819a9c --- /dev/null +++ b/3Depict-0.0.10-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-0.0.10-png-gray.patch b/3Depict-0.0.10-png-gray.patch new file mode 100644 index 0000000..5c0e793 --- /dev/null +++ b/3Depict-0.0.10-png-gray.patch @@ -0,0 +1,15 @@ +diff -r src/pngread.c src/pngread.c +--- src/pngread.c ++++ src/pngread.c +@@ -132,11 +132,7 @@ int read_png(FILE *fp, unsigned int sig_read, png_bytep **row_pointers, + /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +-#if defined(__APPLE__) || defined(__WIN32) || defined(__WIN64) + png_set_expand_gray_1_2_4_to_8(png_ptr); +-#else +- png_set_gray_1_2_4_to_8(png_ptr); +-#endif + } + + /* Expand paletted or RGB images with transparency to full alpha for RGBA */ diff --git a/3Depict-0.0.9-font-path.patch b/3Depict-0.0.9-font-path.patch deleted file mode 100644 index 70252ee..0000000 --- a/3Depict-0.0.9-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.9-gcc-4.7.patch b/3Depict-0.0.9-gcc-4.7.patch deleted file mode 100644 index de3d034..0000000 --- a/3Depict-0.0.9-gcc-4.7.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -r 6b379ae667ab src/basics.cpp ---- src/basics.cpp Sun Dec 18 21:00:25 2011 +0000 -+++ src/basics.cpp Sun Dec 18 21:00:47 2011 +0000 -@@ -719,15 +719,12 @@ - #else - const unsigned int NUM_FUZZY_ENTRIES=16; - #endif -- //Sorted sequence of fuzzy times, from biggest to smallest -+ //Sorted sequence of fuzzy, approximate times, from biggest to smallest - const time_t TIMESTOPS[] = { --#ifndef WIN32 -- (100*365.25*24*60*60), //One century --#endif -- (10*365.25*24*60*60), //One decade -- (365.25*24*60*60), // One year -- (365.25/12.0*24*60*60), // One month -- (7.0*24*60*60), //One week -+ (10*36525*24*6*6), //One decade (factor of 100 taken to prevent invalid C++11 narrowing double) -+ (36525*24*6*6), // One year -+ (36525/12*24*6*6), // One month (factor of 100 taken from minutes and hrs to prevent invalid C++11 narrowing double code) -+ (7*24*60*60), //One week - (24*60*60), //One day - (60*60), //One hour - (45*60),// 45 minutes -@@ -744,9 +741,6 @@ - - //Do these have a meaningful plural? - bool HAVE_PLURALS[] = { --#ifndef WIN32 -- true,//Century --#endif - true, //decade - true, //year - true, //month -@@ -767,9 +761,6 @@ - - //Singular version - const char *SINGLE_FUZZY_STRING[] = { --#ifndef WIN32 -- NTRANS("a century ago"), --#endif - NTRANS("a decade ago"), - NTRANS("a year ago"), - NTRANS("a month ago"), -diff -r 6b379ae667ab src/effect.h ---- src/effect.h Sun Dec 18 21:00:25 2011 +0000 -+++ src/effect.h Sun Dec 18 21:00:47 2011 +0000 -@@ -70,6 +70,8 @@ - static BoundCube bc; - unsigned int effectType; - public: -+ Effect(){}; -+ virtual ~Effect() {}; - virtual void enable(unsigned int pass=0) const =0; - virtual void disable() const=0; - std::string getName() const; -@@ -112,7 +114,7 @@ - void doClip(const Point3D &origin, const Point3D & normal,unsigned int glOffset) const; - public: - BoxCropEffect(){useCamCoordinates=false;effectType=EFFECT_BOX_CROP;openGLIdStart=0; } -- ~BoxCropEffect(){}; -+ virtual ~BoxCropEffect(){}; - - //!Enable the clipping plane. Values *must* be set before calling - void enable(unsigned int pass) const; -diff -r 6b379ae667ab src/glPane.cpp ---- src/glPane.cpp Sun Dec 18 21:00:25 2011 +0000 -+++ src/glPane.cpp Sun Dec 18 21:00:47 2011 +0000 -@@ -517,7 +517,6 @@ - { - if(currentScene.haveTempCam()) - { -- wxPoint draggingCurrent = event.GetPosition(); - currentScene.commitTempCam(); - dragging=false; - } -diff -r 6b379ae667ab src/mathglPane.cpp ---- src/mathglPane.cpp Sun Dec 18 21:00:25 2011 +0000 -+++ src/mathglPane.cpp Sun Dec 18 21:00:47 2011 +0000 -@@ -807,7 +807,6 @@ - { - if(mouseDragMode == MOUSE_MODE_DRAG_PAN) - { -- wxPoint draggingEnd = event.GetPosition(); - mouseDragMode=MOUSE_MODE_ENUM_END; - //Repaint - Refresh(); -diff -r 6b379ae667ab src/plot.h ---- src/plot.h Sun Dec 18 21:00:25 2011 +0000 -+++ src/plot.h Sun Dec 18 21:00:47 2011 +0000 -@@ -122,6 +122,8 @@ - class PlotBase - { - public: -+ PlotBase(){}; -+ virtual ~PlotBase(){}; - //The type of plot (ie what class is it?) - unsigned int plotType; - -diff -r 6b379ae667ab src/xmlHelper.h ---- src/xmlHelper.h Sun Dec 18 21:00:25 2011 +0000 -+++ src/xmlHelper.h Sun Dec 18 21:00:47 2011 +0000 -@@ -27,6 +27,7 @@ - #include - using std::string; - -+#include "basics.h" - - //These functions return nonzero on failure, - //zero on success diff --git a/3Depict-0.0.9-manual-pdf-loc.patch b/3Depict-0.0.9-manual-pdf-loc.patch deleted file mode 100644 index a819a9c..0000000 --- a/3Depict-0.0.9-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.9-png-gray.patch b/3Depict-0.0.9-png-gray.patch deleted file mode 100644 index 5c0e793..0000000 --- a/3Depict-0.0.9-png-gray.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r src/pngread.c src/pngread.c ---- src/pngread.c -+++ src/pngread.c -@@ -132,11 +132,7 @@ int read_png(FILE *fp, unsigned int sig_read, png_bytep **row_pointers, - /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { --#if defined(__APPLE__) || defined(__WIN32) || defined(__WIN64) - png_set_expand_gray_1_2_4_to_8(png_ptr); --#else -- png_set_gray_1_2_4_to_8(png_ptr); --#endif - } - - /* Expand paletted or RGB images with transparency to full alpha for RGBA */ diff --git a/3Depict.spec b/3Depict.spec index 2a40153..7ab11dc 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.9 -Release: 4%{?dist} +Version: 0.0.10 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -33,15 +33,14 @@ BuildRequires: tex(latex) BuildRequires: qhull-devel #Fedora specific PDF dir. -Patch0: %{name}-0.0.9-manual-pdf-loc.patch +Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir -Patch1: %{name}-0.0.9-font-path.patch -#Patch for libpng 1.4.0 removing png_set_gray_1_2_4_to_8 -#libpng.sourceforge.net/ANNOUNCE-1.4.0.txt -Patch2: %{name}-0.0.9-png-gray.patch -Patch3: %{name}-0.0.9-gcc-4.7.patch +Patch1: %{name}-%{version}-font-path.patch +#libpng API change patch +Patch2: %{name}-%{version}-png-gray.patch + %description -This program is designed to help users visualize and analyze 3D point clouds +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. @@ -53,14 +52,8 @@ 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 -#export CFLAGS="$RPM_OPT_FLAGS -fopenmp" -#export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp" %configure --disable-debug-checks --enable-openmp-parallel make %{?_smp_mflags} @@ -126,6 +119,9 @@ rm -rf %{buildroot} %changelog +* Sun Apr 1 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 @@ -135,8 +131,8 @@ rm -rf %{buildroot} * Thu Jan 12 2012 Fedora Release Engineering - 0.0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Tue Dec 06 2011 Adam Jackson - 0.0.9-1 -- Rebuild for new libpng +* Sat Dec 20 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 diff --git a/sources b/sources index 2959acd..9fbd835 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9be57d2690cfe81398362f371fc681e3 3Depict-0.0.9.tar.gz +f9d433f04ddadb2f2d0cc5330b2b2790 3Depict-0.0.10.tar.gz