Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv32152
Modified Files: fityk-cli.info Added Files: fityk-cli.patch Log Message: fix for gcc-4.2.1 c++ strictness; switch to newer readline (and use shared lib of it), +missing runtime deps --- NEW FILE: fityk-cli.patch --- diff -Nurd -x'*~' fityk-0.3.2.orig/src/gfunc.h fityk-0.3.2/src/gfunc.h --- fityk-0.3.2.orig/src/gfunc.h 2003-02-23 20:51:12.000000000 -0500 +++ fityk-0.3.2/src/gfunc.h 2011-10-03 16:56:49.000000000 -0400 @@ -28,7 +28,7 @@ std::vector<int_fp> get_derivatives (const std::vector<fp>& A, const std::vector<V_g*>& G); static std::vector<char> all_types(); - static V_g* V_g::factory (Sum* sum, char type, const std::vector<Pag> &p); + static V_g* factory (Sum* sum, char type, const std::vector<Pag> &p); protected: virtual void prepare_deriv () = 0; diff -Nurd -x'*~' fityk-0.3.2.orig/src/sum.h fityk-0.3.2/src/sum.h --- fityk-0.3.2.orig/src/sum.h 2003-02-24 08:58:15.000000000 -0500 +++ fityk-0.3.2/src/sum.h 2011-10-03 16:57:33.000000000 -0400 @@ -84,11 +84,11 @@ int fzg_size (One_of_fzg fzg) const; int add_fzg (One_of_fzg fzg, char type, const std::vector<Pag> &p, const std::string &desc = ""); - std::string Sum::info_fzg (One_of_fzg fzg, int n) const; + std::string info_fzg (One_of_fzg fzg, int n) const; std::string info_fzg_parameters(One_of_fzg fzg, int n, bool only_val) const; int rm_fzg (One_of_fzg fzg, int n, bool silent = false); int multi_rm_fzg (One_of_fzg fzg, std::vector<int> nn, bool silent = false); - int Sum::rm_all(); + int rm_all(); const V_fzg *get_fzg (One_of_fzg fzg, int n) const; V_fzg *get_fzg_m (One_of_fzg fzg, int n) { return const_cast<V_fzg*>(get_fzg (fzg, n)); } Index: fityk-cli.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/fityk-cli.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- fityk-cli.info 12 Jan 2009 04:54:17 -0000 1.6 +++ fityk-cli.info 3 Oct 2011 21:05:46 -0000 1.7 @@ -1,16 +1,18 @@ Package: fityk-cli Version: 0.3.2 -Revision: 1004 +Revision: 1005 GCC: 4.0 Maintainer: Alexandre Vial <av...@altern.org> -Depends: gnuplot (>= 4.0.0-1002) -BuildDepends: readline (>= 4.3-1028), libncurses5 (>= 5.4-20041023-1006) +Depends: gnuplot (>= 4.0.0-1002), readline5-shlibs, libncurses5-shlibs +BuildDepends: readline5, libncurses5 (>= 5.4-20041023-1006) Conflicts: fityk Source: http://www.unipress.waw.pl/soft/crystallography/fityk/d/fityk-%v.tar.gz Source-MD5: dd2a1322b2736594ca941d164eba0127 SourceDirectory: fityk-%v +PatchFile: %n.patch +PatchFile-MD5: 35fa5344d041b1e3a4050643e743e2b6 UpdateConfigGuess: true -ConfigureParams: --disable-GUI --with-readline=%p/lib/libreadline.a --includedir=%p/include +ConfigureParams: --disable-GUI --with-readline=%p/lib/libreadline.dylib --includedir=%p/include InstallScript: << make install prefix=%i mkdir -p %i/share/doc/%n @@ -35,6 +37,9 @@ << DescPort: << GUI disabled, thus we do not need wxgtk, and results are displayed with gnuplot. + + Newer xcode has c++ compiler that is stricter about namespace + qualifiers. << Homepage: http://www.unipress.waw.pl/soft/crystallography/fityk/ License: GPL ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs