Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv15545
Modified Files:
stellarium.info stellarium.patch
Log Message:
Fix duplicate asinh symbol.
Index: stellarium.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/stellarium.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stellarium.patch 11 Jul 2011 04:05:48 -0000 1.1
+++ stellarium.patch 1 Sep 2011 23:34:43 -0000 1.2
@@ -1,6 +1,6 @@
diff -ru stellarium-0.11.0.orig/CMakeLists.txt stellarium-0.11.0/CMakeLists.txt
--- stellarium-0.11.0.orig/CMakeLists.txt 2011-07-02 09:22:18.000000000
-0400
-+++ stellarium-0.11.0/CMakeLists.txt 2011-07-02 18:46:00.000000000 -0400
++++ stellarium-0.11.0/CMakeLists.txt 2011-09-01 19:29:39.000000000 -0400
@@ -232,9 +232,10 @@
########### Set some global variables ###########
@@ -24,9 +24,71 @@
ADD_CUSTOM_TARGET(macosx_bundle bash util/macosx_bundle.sh
${CMAKE_INSTALL_PREFIX} ${PROJECT_SOURCE_DIR} DEPENDS install WORKING_DIRECTORY
${PROJECT_SOURCE_DIR} COMMENT "making the macosx bundle." VERBATIM)
ENDIF()
+diff -ru stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.cpp
stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.cpp
+--- stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.cpp
2011-07-02 09:22:18.000000000 -0400
++++ stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.cpp
2011-09-01 19:31:28.000000000 -0400
+@@ -207,13 +207,13 @@
+ *
+
+ * ---------------------------------------------------------------------------
*/
+
+
+
+-double asinh
+
++/*double asinh
+
+ (
+
+ double xval
+
+ )
+
+ {
+
+ return log( xval + sqrt( xval*xval + 1.0 ) );
+
+- } // end asinh
+
++ } */ // end asinh
+
+
+
+
+
+ /*
-----------------------------------------------------------------------------
+
+diff -ru stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.h
stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.h
+--- stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.h
2011-07-02 09:22:18.000000000 -0400
++++ stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.h
2011-09-01 19:31:59.000000000 -0400
+@@ -62,10 +62,10 @@
+ double& e0, double& m
+
+ );
+
+
+
+-double asinh
+
++/*double asinh
+
+ (
+
+ double xval
+
+- );
+
++ );*/
+
+
+
+ void rv2coe
+
+ (
+
diff -ru stellarium-0.11.0.orig/src/core/StelFileMgr.cpp
stellarium-0.11.0/src/core/StelFileMgr.cpp
--- stellarium-0.11.0.orig/src/core/StelFileMgr.cpp 2011-07-02
09:22:18.000000000 -0400
-+++ stellarium-0.11.0/src/core/StelFileMgr.cpp 2011-07-02 18:46:00.000000000
-0400
++++ stellarium-0.11.0/src/core/StelFileMgr.cpp 2011-09-01 19:29:39.000000000
-0400
@@ -51,7 +51,7 @@
{
userDir = winApiPath + "\\Stellarium";
@@ -70,9 +132,37 @@
// Windows and MacOS X have the locale dir in the installation folder
localePath = QFileInfo(getInstallationDir() + "/locale");
// or MacosxDirs::getApplicationResourcesDirectory().append( "/locale"
);
+diff -ru stellarium-0.11.0.orig/src/core/StelUtils.cpp
stellarium-0.11.0/src/core/StelUtils.cpp
+--- stellarium-0.11.0.orig/src/core/StelUtils.cpp 2011-07-02
09:22:18.000000000 -0400
++++ stellarium-0.11.0/src/core/StelUtils.cpp 2011-09-01 19:32:15.000000000
-0400
+@@ -413,10 +413,10 @@
+ }
+
+ // Return the inverse sinus hyperbolic of z
+-double asinh(double z)
++/*double asinh(double z)
+ {
+ return std::log(z+std::sqrt(z*z+1));
+-}
++}*/
+
+ /*************************************************************************
+ Convert a QT QDateTime class to julian day
+diff -ru stellarium-0.11.0.orig/src/core/StelUtils.hpp
stellarium-0.11.0/src/core/StelUtils.hpp
+--- stellarium-0.11.0.orig/src/core/StelUtils.hpp 2011-07-02
09:22:18.000000000 -0400
++++ stellarium-0.11.0/src/core/StelUtils.hpp 2011-09-01 19:32:36.000000000
-0400
+@@ -177,7 +177,7 @@
+ int getBiggerPowerOfTwo(int value);
+
+ //! Return the inverse sinus hyperbolic of z.
+- double asinh(double z);
++ /*double asinh(double z);*/
+
+ ///////////////////////////////////////////////////
+ // New Qt based General Calendar Functions.
diff -ru stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues.h
stellarium-0.11.0/src/core/external/glues_stel/source/glues.h
--- stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues.h
2011-07-02 09:22:18.000000000 -0400
-+++ stellarium-0.11.0/src/core/external/glues_stel/source/glues.h
2011-07-02 18:46:00.000000000 -0400
++++ stellarium-0.11.0/src/core/external/glues_stel/source/glues.h
2011-09-01 19:29:39.000000000 -0400
@@ -39,7 +39,7 @@
#ifdef USE_OPENGL_ES2
@@ -84,7 +174,7 @@
# include <GLES/gl.h>
diff -ru
stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues_error.c
stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c
--- stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues_error.c
2011-07-02 09:22:18.000000000 -0400
-+++ stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c
2011-07-02 18:46:00.000000000 -0400
++++ stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c
2011-09-01 19:29:39.000000000 -0400
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -96,7 +186,7 @@
# include <GLES/gl.h>
diff -ru stellarium-0.11.0.orig/util/macosx_bundle.sh
stellarium-0.11.0/util/macosx_bundle.sh
--- stellarium-0.11.0.orig/util/macosx_bundle.sh 2011-07-02
09:22:18.000000000 -0400
-+++ stellarium-0.11.0/util/macosx_bundle.sh 2011-07-02 18:49:57.000000000
-0400
++++ stellarium-0.11.0/util/macosx_bundle.sh 2011-09-01 19:29:39.000000000
-0400
@@ -17,20 +17,6 @@
rmdir ${CMAKE_INSTALL_PREFIX}/Resources/stellarium
Index: stellarium.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/stellarium.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stellarium.info 11 Jul 2011 04:05:48 -0000 1.1
+++ stellarium.info 1 Sep 2011 23:34:43 -0000 1.2
@@ -1,14 +1,14 @@
Info2: <<
Package: stellarium-%type_pkg[qt]
Version: 0.11.0
-Revision: 1
+Revision: 2
Type: qt (mac x11)
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <[email protected]>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
Source-MD5: 5a4447661fcdeabe8730dca2081367db
PatchFile: stellarium.patch
-PatchFile-MD5: eaebd7060996a6ce111adcf900a1e0b8
+PatchFile-MD5: 54b6eef8eb619c117fafdda451eedc29
BuildDepends: <<
boost1.41.cmake,
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
