Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9120
Modified Files:
stellarium.info stellarium.patch
Log Message:
New upstream version (0.7.0)
Index: stellarium.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/stellarium.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stellarium.patch 27 Apr 2005 03:26:24 -0000 1.1
+++ stellarium.patch 16 Sep 2005 01:25:35 -0000 1.2
@@ -1,7 +1,7 @@
-diff -ru stellarium-0.6.2.orig/configure stellarium-0.6.2/configure
---- stellarium-0.6.2.orig/configure 2004-11-18 17:54:06.000000000 -0500
-+++ stellarium-0.6.2/configure 2004-11-26 08:57:48.000000000 -0500
-@@ -5653,7 +5653,7 @@
+diff -ru stellarium-0.7.0.orig/configure stellarium-0.7.0/configure
+--- stellarium-0.7.0.orig/configure 2005-09-07 12:19:21.000000000 -0400
++++ stellarium-0.7.0/configure 2005-09-15 15:51:35.000000000 -0400
+@@ -13934,7 +13934,7 @@
CFLAGS="$CFLAGS $X_CFLAGS"
case "$host" in
@@ -10,7 +10,7 @@
SDL_VERSION=1.2.0
;;
-@@ -6359,7 +6359,7 @@
+@@ -14725,7 +14725,7 @@
case "$host" in
@@ -19,7 +19,7 @@
PKGDATADIR="Stellarium.app/Contents/Resources"
;;
*)
-@@ -6384,7 +6384,7 @@
+@@ -14756,7 +14756,7 @@
#define MACOSX 1
_ACEOF
@@ -28,15 +28,120 @@
LIBS="$LIBS -framework OpenGL -lobjc "
;;
-diff -ru stellarium-0.6.2.orig/src/main.cpp stellarium-0.6.2/src/main.cpp
---- stellarium-0.6.2.orig/src/main.cpp 2004-10-08 20:14:04.000000000 -0400
-+++ stellarium-0.6.2/src/main.cpp 2004-11-26 08:57:48.000000000 -0500
-@@ -142,7 +142,7 @@
+diff -ru stellarium-0.7.0.orig/src/fmath.h stellarium-0.7.0/src/fmath.h
+--- stellarium-0.7.0.orig/src/fmath.h 2005-09-08 12:22:01.000000000 -0400
++++ stellarium-0.7.0/src/fmath.h 2005-09-15 17:00:10.000000000 -0400
+@@ -27,9 +27,9 @@
+ # include "config.h"
+ #endif
- // If the system is non unix (windows) or if it's macosx the config
file is in the
- // config/ directory of the dataRoot directory
--#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__) ||
defined(MACOSX)
-+#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__)
- CDIR = DATA_ROOT + "/config/";
+-#ifndef HAVE_POW10
++//#ifndef HAVE_POW10
+ # define pow10(x) (float)pow(10.f,(x))
+-#endif
++//#endif
+ #ifndef HAVE_ACOSF
+ # define acosf(x) (float)(acos(x))
+ #endif
+diff -ru stellarium-0.7.0.orig/src/main.cpp stellarium-0.7.0/src/main.cpp
+--- stellarium-0.7.0.orig/src/main.cpp 2005-09-08 12:23:36.000000000 -0400
++++ stellarium-0.7.0/src/main.cpp 2005-09-15 16:36:55.000000000 -0400
+@@ -93,6 +93,7 @@
+ // This enable to launch stellarium from the local directory without
installing it
+ void setDirectories(const char* executableName)
+ {
++#undef MACOSX
+ #if !defined(MACOSX) && !defined(XCODE)
+ // The variable CONFIG_DATA_DIR must have been set by the configure
script
+ // Its value is the dataRoot directory, ie the one containing data/ and
textures/
+@@ -228,6 +229,7 @@
+ CDIR = cdir;
+ DATA_ROOT = data_root;
+ #endif
++#define MACOSX 1
+ }
+
+
+@@ -264,11 +266,11 @@
+ stel_core* core = new stel_core(DDIR, TDIR, CDIR, DATA_ROOT);
+
+ // Give the config file parameters which has to be given "hard coded"
+-#if !defined(MACOSX) && !defined(XCODE)
++//#if !defined(MACOSX) && !defined(XCODE)
+ core->set_config_files("config.ini");
+-#else
+- core->set_config_files(STELLARIUM_CONF_FILE);
+-#endif
++//#else
++// core->set_config_files(STELLARIUM_CONF_FILE);
++//#endif
+
+ // Load the configuration options from the given file names
+ // This includes the video parameters
+diff -ru stellarium-0.7.0.orig/src/observator.cpp
stellarium-0.7.0/src/observator.cpp
+--- stellarium-0.7.0.orig/src/observator.cpp 2005-09-08 17:00:24.000000000
-0400
++++ stellarium-0.7.0/src/observator.cpp 2005-09-15 19:45:01.000000000
-0400
+@@ -224,7 +224,7 @@
+ struct tm *timeinfo;
+ time_t rawtime; time(&rawtime);
+ timeinfo = localtime(&rawtime);
+- return -(float)timezone/3600 + (timeinfo->tm_isdst!=0);
++ return (float)timeinfo->tm_gmtoff/3600;
+ #endif
+
+ //#endif
+diff -ru stellarium-0.7.0.orig/src/stel_utility.cpp
stellarium-0.7.0/src/stel_utility.cpp
+--- stellarium-0.7.0.orig/src/stel_utility.cpp 2005-09-08 12:30:13.000000000
-0400
++++ stellarium-0.7.0/src/stel_utility.cpp 2005-09-15 20:21:56.000000000
-0400
+@@ -137,7 +137,7 @@
+ const char* s = str.c_str();
+ char *mptr, *ptr, *dec, *hh;
+ int negative = 0;
+- char delim1[] = " :.,;DdHhMm'\n\t";
++ char delim1[] = " :.,;ºDdHhMm'\n\t";
+ char delim2[] = " NSEWnsew\"\n\t";
+ int dghh = 0, minutes = 0;
+ double seconds = 0.0, pos;
+@@ -234,7 +234,7 @@
+ * \param location Location angle in degress
+ * \return Angle string
+ *
+-* Obtains a human readable location in the form: ddmm'ss.ss"
++* Obtains a human readable location in the form: dd mm'ss.ss"
+ */
+ string print_angle_dms(double location)
+ {
+@@ -267,7 +267,7 @@
+ }
+ }
+
+- sprintf(buf,"%+.2d%.2d'%.2f\"",(int)deg, (int) min, sec);
++ sprintf(buf,"%+.2d %.2d'%.2f\"",(int)deg, (int) min, sec);
+ return buf;
+ }
+
+diff -ru stellarium-0.7.0.orig/src/stellarium.h
stellarium-0.7.0/src/stellarium.h
+--- stellarium-0.7.0.orig/src/stellarium.h 2005-09-08 12:28:09.000000000
-0400
++++ stellarium-0.7.0/src/stellarium.h 2005-09-15 16:19:31.000000000 -0400
+@@ -41,15 +41,15 @@
+ #define MY_MIN(a,b) (((a)<(b))?(a):(b))
+
+ // Used for GNU gettext translations
+-#ifndef MACOSX
++//#ifndef MACOSX
+ #include "gettext.h"
+ #define _(String) gettext (String)
+ #define N_(String) gettext_noop(String)
+-#else
+-# include "POSupport.h"
+-# define _(String) localizedUTF8String(String)
+-# define N_(String) (String)
+-#endif
++//#else
++//# include "POSupport.h"
++//# define _(String) localizedUTF8String(String)
++//# define N_(String) (String)
++//#endif
+
+ #include <cassert>
- if ((tempFile = fopen((CDIR + "config.ini").c_str(),"r")))
Index: stellarium.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/stellarium.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stellarium.info 27 Apr 2005 03:26:24 -0000 1.1
+++ stellarium.info 16 Sep 2005 01:25:35 -0000 1.2
@@ -1,14 +1,16 @@
Package: stellarium
-Version: 0.6.2
-Revision: 4
+Version: 0.7.0
+Revision: 1
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
-Source-MD5: f00e99b88f53273419683cf18905e39c
+Source-MD5: 6cee877a8b3be333eecc6de79a12c78d
Patch: %n.patch
-ConfigureParams: --mandir=%p/share/man --with-sdl-prefix=%p
--disable-dependency-tracking --disable-sdltest CC=gcc-3.3 CXX=g++-3.3
-BuildDepends: sdl (>= 1.2.8-1), macosx (>= 10.3.0-1), gcc3.3
-Depends: sdl-shlibs (>= 1.2.8-1), macosx (>= 10.3.0-1)
+# stellarium will NOT currently build with g++-4.0. Many errors. Force use of
g++-3.3
+ConfigureParams: --mandir=%p/share/man --with-sdl-prefix=%p
--disable-dependency-tracking --disable-sdltest CXX=g++-3.3
+BuildDepends: sdl (>= 1.2.8-1), macosx (>= 10.3.0-1), gcc3.3, libgettext3-dev,
libiconv-dev, libpng3
+Depends: sdl-shlibs (>= 1.2.8-1), macosx (>= 10.3.0-1), libgettext3-shlibs,
libiconv, libpng3-shlibs
+BuildConflicts: sdl-mixer
GCC: 3.3
DescDetail: <<
Stellarium renders a real time, photorealistic 3D image of the sky using
@@ -57,4 +59,4 @@
<<
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
doc/developer_guide.tex
License: GPL
-Homepage: http://stellarium.free.fr/
\ No newline at end of file
+Homepage: http://stellarium.sourceforge.net/
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
