mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Unbreak by making port buildable with libnova 0.11

Browse Source 
Volunteers for maintaining it when 0.5 comes out?
This commit is contained in:
Edwin Groothuis 2005-11-05 02:32:40 +00:00
parent ded85347ac
commit 54a6bdd6f8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=147251
23 changed files with 1507 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
astro/nova/Makefile
View File

@ -8,13 +8,13 @@
PORTNAME= nova
PORTVERSION= 0.4
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An Integrated Observational Environment for amatuer astronomers
COMMENT= An Integrated Observational Environment for amateur astronomers
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \
@ -24,23 +24,15 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
gnomecanvasmm-2.0.1:${PORTSDIR}/graphics/libgnomecanvasmm \
gnomeuimm-2.0.1:${PORTSDIR}/x11-toolkits/libgnomeuimm \
xml\\+\\+-1.0.1:${PORTSDIR}/textproc/libxml++ \
nova-0.9.0:${PORTSDIR}/astro/libnova
nova-0.11.0:${PORTSDIR}/astro/libnova
RUN_DEPENDS= ${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000
BROKEN= Broken dependency
#USE_AUTOMAKE_VER=17
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --datadir=${DATADIR}
USE_GCC= 3.3+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
BROKEN= "Does not compile with gcc 2.x"
.endif
post-patch:
@${REINPLACE_CMD} -e 's,/nova/,/share/nova/,' ${WRKSRC}/configure
.include <bsd.port.post.mk>
.include <bsd.port.mk>

33
astro/nova/files/patch-configure Normal file
View File

@ -0,0 +1,33 @@
--- configure.orig Mon Jan 5 05:54:36 2004
+++ configure Sat Nov 5 13:27:16 2005
@@ -8350,7 +8350,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libnova.h>
+#include <libnova/libnova.h>
static char*
my_strdup (char *str)
@@ -8619,17 +8619,17 @@
# Set NOVA_PIXMAP_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
cat >>confdefs.h <<_ACEOF
-#define NOVA_PIXMAP_DIR "${ac_default_prefix}/nova/pixmaps"
+#define NOVA_PIXMAP_DIR "${ac_default_prefix}/share/nova/pixmaps"
_ACEOF
- NOVA_PIXMAP_DIR=${ac_default_prefix}/nova/pixmaps
+ NOVA_PIXMAP_DIR=${ac_default_prefix}/share/nova/pixmaps
else
cat >>confdefs.h <<_ACEOF
-#define NOVA_PIXMAP_DIR "${prefix}/nova/pixmaps"
+#define NOVA_PIXMAP_DIR "${prefix}/share/nova/pixmaps"
_ACEOF
- NOVA_PIXMAP_DIR=${prefix}/nova/pixmaps
+ NOVA_PIXMAP_DIR=${prefix}/share/nova/pixmaps
fi

83
astro/nova/files/patch-src__castor__asteroid.cc Normal file
View File

@ -0,0 +1,83 @@
--- src/castor/asteroid.cc.orig Sat Nov 5 12:43:37 2005
+++ src/castor/asteroid.cc Sat Nov 5 12:44:30 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "asteroid.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
#include <libgnomecanvasmm/group.h>
#include <libgnomecanvasmm/ellipse.h>
@@ -47,7 +47,7 @@
void Asteroid::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn posn;
- get_ell_body_equ_coords (JD, &m_orbit, &posn);
+ ln_get_ell_body_equ_coords (JD, &m_orbit, &posn);
ra = posn.ra;
dec = posn.dec;
}
@@ -63,7 +63,7 @@
get_equ_posn(JD, ra, dec);
equ_posn.ra = ra;
equ_posn.dec = dec;
- get_hrz_from_equ (&equ_posn, observer, JD, posn);
+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn);
}
/*! \fn void Asteroid::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -71,7 +71,7 @@
*/
void Asteroid::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_ell_body_rst(JD, observer, &m_orbit, time);
+ ln_get_ell_body_rst(JD, observer, &m_orbit, time);
}
/*! \fn double Asteroid::get_mag(double JD)
@@ -79,7 +79,7 @@
*/
double Asteroid::get_mag(double JD)
{
- get_asteroid_mag (JD, &m_orbit, m_H, m_G);
+ ln_get_asteroid_mag (JD, &m_orbit, m_H, m_G);
}
/*! \fn void Asteroid::get_id(std::string& id)
@@ -111,7 +111,7 @@
void Asteroid::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD);
double sdiam = (get_sdiam_arc(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -134,22 +134,22 @@
double Asteroid::get_earth_dist (double JD)
{
- return get_ell_body_earth_dist (JD, &m_orbit);
+ return ln_get_ell_body_earth_dist (JD, &m_orbit);
}
double Asteroid::get_sun_dist (double JD)
{
- return get_ell_body_solar_dist (JD, &m_orbit);
+ return ln_get_ell_body_solar_dist (JD, &m_orbit);
}
double Asteroid::get_sdiam_km ()
{
- return get_asteroid_sdiam_km(m_H, m_A);
+ return ln_get_asteroid_sdiam_km(m_H, m_A);
}
double Asteroid::get_sdiam_arc (double JD)
{
- return get_asteroid_sdiam_arc(JD, &m_orbit, m_H, m_A);
+ return ln_get_asteroid_sdiam_arc(JD, &m_orbit, m_H, m_A);
}
void Asteroid::set_render_jd (double JD)

87
astro/nova/files/patch-src__castor__comet.cc Normal file
View File

@ -0,0 +1,87 @@
--- src/castor/comet.cc.orig Sat Nov 5 12:44:45 2005
+++ src/castor/comet.cc Sat Nov 5 12:45:28 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "comet.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
#include <libgnomecanvasmm/group.h>
#include <libgnomecanvasmm/ellipse.h>
@@ -60,9 +60,9 @@
struct ln_equ_posn posn;
if (m_is_parabolic)
- get_par_body_equ_coords (JD, &m_porbit, &posn);
+ ln_get_par_body_equ_coords (JD, &m_porbit, &posn);
else
- get_ell_body_equ_coords (JD, &m_eorbit, &posn);
+ ln_get_ell_body_equ_coords (JD, &m_eorbit, &posn);
ra = posn.ra;
dec = posn.dec;
@@ -81,7 +81,7 @@
get_equ_posn(JD, ra, dec);
equ_posn.ra = ra;
equ_posn.dec = dec;
- get_hrz_from_equ (&equ_posn, observer, JD, posn);
+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn);
}
/*! \fn void Comet::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -90,9 +90,9 @@
void Comet::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
if (m_is_parabolic)
- get_par_body_rst(JD, observer, &m_porbit, time);
+ ln_get_par_body_rst(JD, observer, &m_porbit, time);
else
- get_ell_body_rst(JD, observer, &m_eorbit, time);
+ ln_get_ell_body_rst(JD, observer, &m_eorbit, time);
}
/*! \fn double Comet::get_mag(double JD)
@@ -101,9 +101,9 @@
double Comet::get_mag(double JD)
{
if (m_is_parabolic)
- return get_par_comet_mag (JD, &m_porbit, m_g, m_k);
+ return ln_get_par_comet_mag (JD, &m_porbit, m_g, m_k);
else
- return get_ell_comet_mag (JD, &m_eorbit, m_g, m_k);
+ return ln_get_ell_comet_mag (JD, &m_eorbit, m_g, m_k);
}
/*! \fn void Comet::get_id(std::string& id)
@@ -135,7 +135,7 @@
void Comet::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD);
double shadow = 1.1 * size;
Gnome::Canvas::Ellipse *ellipse_back, *ellipse;
@@ -161,17 +161,17 @@
double Comet::get_earth_dist (double JD)
{
if (m_is_parabolic)
- return get_par_body_earth_dist(JD, &m_porbit);
+ return ln_get_par_body_earth_dist(JD, &m_porbit);
else
- return get_ell_body_earth_dist (JD, &m_eorbit);
+ return ln_get_ell_body_earth_dist (JD, &m_eorbit);
}
double Comet::get_sun_dist (double JD)
{
if (m_is_parabolic)
- return get_par_body_solar_dist(JD, &m_porbit);
+ return ln_get_par_body_solar_dist(JD, &m_porbit);
else
- return get_ell_body_solar_dist (JD, &m_eorbit);
+ return ln_get_ell_body_solar_dist (JD, &m_eorbit);
}
}

22
astro/nova/files/patch-src__castor__galaxy.cc Normal file
View File

@ -0,0 +1,22 @@
--- src/castor/galaxy.cc.orig Sat Nov 5 12:57:42 2005
+++ src/castor/galaxy.cc Sat Nov 5 12:58:27 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "galaxy.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -130,8 +130,8 @@
{
struct ln_equ_posn equ_posn;
- get_equ_solar_coords(JD, &equ_posn);
- get_hrz_from_equ (&equ_posn, observer, JD, posn);
+ ln_get_solar_equ_coords(JD, &equ_posn);
+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn);
}
/*! \fn void Galaxy::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)

112
astro/nova/files/patch-src__castor__jupiter.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/jupiter.cc.orig Sat Nov 5 12:52:50 2005
+++ src/castor/jupiter.cc Sat Nov 5 12:53:17 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "jupiter.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Jupiter::get_disk (double JD)
{
- return get_jupiter_disk(JD);
+ return ln_get_jupiter_disk(JD);
}
/*! \fn void Jupiter::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Jupiter::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_jupiter_equ_coords (JD, &equ);
+ ln_get_jupiter_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_jupiter_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_jupiter_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Jupiter::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Jupiter::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_jupiter_rst(JD, observer, time);
+ ln_get_jupiter_rst(JD, observer, time);
}
/*! \fn double Jupiter::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_jupiter_magnitude (JD);
+ return ln_get_jupiter_magnitude (JD);
}
/*! \fn void Jupiter::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Jupiter::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_jupiter_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_jupiter_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -126,37 +126,37 @@
double Jupiter::get_earth_dist (double JD)
{
- return get_jupiter_earth_dist(JD);
+ return ln_get_jupiter_earth_dist(JD);
}
double Jupiter::get_sun_dist (double JD)
{
- return get_jupiter_sun_dist(JD);
+ return ln_get_jupiter_solar_dist(JD);
}
double Jupiter::get_equ_sdiam (double JD)
{
- return get_jupiter_equ_sdiam(JD);
+ return ln_get_jupiter_equ_sdiam(JD);
}
double Jupiter::get_pol_sdiam (double JD)
{
- return get_jupiter_pol_sdiam(JD);
+ return ln_get_jupiter_pol_sdiam(JD);
}
void Jupiter::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_jupiter_helio_coords (JD, position);
+ ln_get_jupiter_helio_coords (JD, position);
}
double Jupiter::get_phase (double JD)
{
- return get_jupiter_phase (JD);
+ return ln_get_jupiter_phase (JD);
}
void Jupiter::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_jupiter_rect_helio (JD, position);
+ ln_get_jupiter_rect_helio (JD, position);
}
void Jupiter::set_render_jd (double JD)

112
astro/nova/files/patch-src__castor__mars.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/mars.cc.orig Sat Nov 5 12:51:25 2005
+++ src/castor/mars.cc Sat Nov 5 12:52:39 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "mars.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Mars::get_disk (double JD)
{
- return get_mars_disk(JD);
+ return ln_get_mars_disk(JD);
}
/*! \fn void Mars::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Mars::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_mars_equ_coords (JD, &equ);
+ ln_get_mars_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_mars_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_mars_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Mars::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Mars::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_mars_rst(JD, observer, time);
+ ln_get_mars_rst(JD, observer, time);
}
/*! \fn double Mars::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_mars_magnitude (JD);
+ return ln_get_mars_magnitude (JD);
}
/*! \fn void Mars::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Mars::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_mars_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_mars_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -125,37 +125,37 @@
double Mars::get_earth_dist (double JD)
{
- return get_mars_earth_dist(JD);
+ return ln_get_mars_earth_dist(JD);
}
double Mars::get_sun_dist (double JD)
{
- return get_mars_sun_dist(JD);
+ return ln_get_mars_solar_dist(JD);
}
double Mars::get_equ_sdiam (double JD)
{
- return get_mars_sdiam(JD);
+ return ln_get_mars_sdiam(JD);
}
double Mars::get_pol_sdiam (double JD)
{
- return get_mars_sdiam(JD);
+ return ln_get_mars_sdiam(JD);
}
void Mars::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_mars_helio_coords (JD, position);
+ ln_get_mars_helio_coords (JD, position);
}
double Mars::get_phase (double JD)
{
- return get_mars_phase (JD);
+ return ln_get_mars_phase (JD);
}
void Mars::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_mars_rect_helio (JD, position);
+ ln_get_mars_rect_helio (JD, position);
}
void Mars::set_render_jd (double JD)

112
astro/nova/files/patch-src__castor__mercury.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/mercury.cc.orig Sat Nov 5 12:45:45 2005
+++ src/castor/mercury.cc Sat Nov 5 12:49:36 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "mercury.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Mercury::get_disk (double JD)
{
- return get_mercury_disk(JD);
+ return ln_get_mercury_disk(JD);
}
@@ -40,7 +40,7 @@
void Mercury::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_mercury_equ_coords (JD, &equ);
+ ln_get_mercury_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -53,8 +53,8 @@
{
struct ln_equ_posn equ;
- get_mercury_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_mercury_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Mercury::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -62,7 +62,7 @@
*/
void Mercury::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_mercury_rst(JD, observer, time);
+ ln_get_mercury_rst(JD, observer, time);
}
/*! \fn double Mercury::get_mag(double JD)
@@ -72,7 +72,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_mercury_magnitude (JD);
+ return ln_get_mercury_magnitude (JD);
}
/*! \fn void Mercury::get_id(std::string& id)
@@ -104,7 +104,7 @@
void Mercury::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_mercury_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_mercury_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -127,37 +127,37 @@
double Mercury::get_earth_dist (double JD)
{
- return get_mercury_earth_dist(JD);
+ return ln_get_mercury_earth_dist(JD);
}
double Mercury::get_sun_dist (double JD)
{
- return get_mercury_sun_dist(JD);
+ return ln_get_mercury_solar_dist(JD);
}
double Mercury::get_equ_sdiam (double JD)
{
- return get_mercury_sdiam(JD);
+ return ln_get_mercury_sdiam(JD);
}
double Mercury::get_pol_sdiam (double JD)
{
- return get_mercury_sdiam(JD);
+ return ln_get_mercury_sdiam(JD);
}
void Mercury::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_mercury_helio_coords (JD, position);
+ ln_get_mercury_helio_coords (JD, position);
}
double Mercury::get_phase (double JD)
{
- return get_mercury_phase (JD);
+ return ln_get_mercury_phase (JD);
}
void Mercury::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_mercury_rect_helio (JD, position);
+ ln_get_mercury_rect_helio (JD, position);
}
void Mercury::set_render_jd (double JD)

40
astro/nova/files/patch-src__castor__nebula.cc Normal file
View File

@ -0,0 +1,40 @@
--- src/castor/nebula.cc.orig Sat Nov 5 12:58:59 2005
+++ src/castor/nebula.cc Sat Nov 5 12:59:25 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "nebula.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Nebula::get_disk (double JD)
{
- return get_solar_sdiam(JD);
+ return ln_get_solar_sdiam(JD);
}
/*! \fn void Nebula::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -47,8 +47,8 @@
{
struct ln_equ_posn equ_posn;
- get_equ_solar_coords(JD, &equ_posn);
- get_hrz_from_equ (&equ_posn, observer, JD, posn);
+ ln_get_solar_equ_coords(JD, &equ_posn);
+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn);
}
/*! \fn void Nebula::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -56,7 +56,7 @@
*/
void Nebula::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_solar_rst(JD, observer, time);
+ ln_get_solar_rst(JD, observer, time);
}
/*! \fn double Nebula::get_ra()

112
astro/nova/files/patch-src__castor__neptune.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/neptune.cc.orig Sat Nov 5 12:56:34 2005
+++ src/castor/neptune.cc Sat Nov 5 12:56:51 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "neptune.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Neptune::get_disk (double JD)
{
- return get_solar_sdiam(JD);
+ return ln_get_solar_sdiam(JD);
}
/*! \fn void Neptune::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Neptune::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_neptune_equ_coords (JD, &equ);
+ ln_get_neptune_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_neptune_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_neptune_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Neptune::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Neptune::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_neptune_rst(JD, observer, time);
+ ln_get_neptune_rst(JD, observer, time);
}
/*! \fn double Neptune::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_neptune_magnitude (JD);
+ return ln_get_neptune_magnitude (JD);
}
/*! \fn void Neptune::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Neptune::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -125,37 +125,37 @@
double Neptune::get_earth_dist (double JD)
{
- return get_neptune_earth_dist(JD);
+ return ln_get_neptune_earth_dist(JD);
}
double Neptune::get_sun_dist (double JD)
{
- return get_neptune_sun_dist(JD);
+ return ln_get_neptune_solar_dist(JD);
}
double Neptune::get_equ_sdiam (double JD)
{
- return get_neptune_sdiam(JD);
+ return ln_get_neptune_sdiam(JD);
}
double Neptune::get_pol_sdiam (double JD)
{
- return get_neptune_sdiam(JD);
+ return ln_get_neptune_sdiam(JD);
}
void Neptune::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_neptune_helio_coords (JD, position);
+ ln_get_neptune_helio_coords (JD, position);
}
double Neptune::get_phase (double JD)
{
- return get_neptune_phase (JD);
+ return ln_get_neptune_phase (JD);
}
void Neptune::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_neptune_rect_helio (JD, position);
+ ln_get_neptune_rect_helio (JD, position);
}
void Neptune::set_render_jd (double JD)

112
astro/nova/files/patch-src__castor__pluto.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/pluto.cc.orig Sat Nov 5 12:57:05 2005
+++ src/castor/pluto.cc Sat Nov 5 12:57:21 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "pluto.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Pluto::get_disk (double JD)
{
- return get_pluto_disk(JD);
+ return ln_get_pluto_disk(JD);
}
/*! \fn void Pluto::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Pluto::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_pluto_equ_coords (JD, &equ);
+ ln_get_pluto_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_pluto_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_pluto_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Pluto::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Pluto::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_pluto_rst(JD, observer, time);
+ ln_get_pluto_rst(JD, observer, time);
}
/*! \fn double Pluto::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_pluto_magnitude (JD);
+ return ln_get_pluto_magnitude (JD);
}
/*! \fn void Pluto::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Pluto::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_pluto_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_pluto_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -125,37 +125,37 @@
double Pluto::get_earth_dist (double JD)
{
- return get_pluto_earth_dist(JD);
+ return ln_get_pluto_earth_dist(JD);
}
double Pluto::get_sun_dist (double JD)
{
- return get_pluto_sun_dist(JD);
+ return ln_get_pluto_solar_dist(JD);
}
double Pluto::get_equ_sdiam (double JD)
{
- return get_pluto_sdiam(JD);
+ return ln_get_pluto_sdiam(JD);
}
double Pluto::get_pol_sdiam (double JD)
{
- return get_pluto_sdiam(JD);
+ return ln_get_pluto_sdiam(JD);
}
void Pluto::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_pluto_helio_coords (JD, position);
+ ln_get_pluto_helio_coords (JD, position);
}
double Pluto::get_phase (double JD)
{
- return get_pluto_phase (JD);
+ return ln_get_pluto_phase (JD);
}
void Pluto::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_pluto_rect_helio (JD, position);
+ ln_get_pluto_rect_helio (JD, position);
}
void Pluto::set_render_jd (double JD)

112
astro/nova/files/patch-src__castor__saturn.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/saturn.cc.orig Sat Nov 5 12:53:27 2005
+++ src/castor/saturn.cc Sat Nov 5 12:53:47 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "saturn.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Saturn::get_disk (double JD)
{
- return get_saturn_disk(JD);
+ return ln_get_saturn_disk(JD);
}
/*! \fn void Saturn::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Saturn::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_saturn_equ_coords (JD, &equ);
+ ln_get_saturn_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_saturn_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_saturn_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Saturn::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Saturn::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_saturn_rst(JD, observer, time);
+ ln_get_saturn_rst(JD, observer, time);
}
/*! \fn double Saturn::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_saturn_magnitude (JD);
+ return ln_get_saturn_magnitude (JD);
}
/*! \fn void Saturn::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Saturn::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_saturn_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_saturn_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -125,37 +125,37 @@
double Saturn::get_earth_dist (double JD)
{
- return get_saturn_earth_dist(JD);
+ return ln_get_saturn_earth_dist(JD);
}
double Saturn::get_sun_dist (double JD)
{
- return get_saturn_sun_dist(JD);
+ return ln_get_saturn_solar_dist(JD);
}
double Saturn::get_equ_sdiam (double JD)
{
- return get_saturn_equ_sdiam(JD);
+ return ln_get_saturn_equ_sdiam(JD);
}
double Saturn::get_pol_sdiam (double JD)
{
- return get_saturn_pol_sdiam(JD);
+ return ln_get_saturn_pol_sdiam(JD);
}
void Saturn::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_saturn_helio_coords (JD, position);
+ ln_get_saturn_helio_coords (JD, position);
}
double Saturn::get_phase (double JD)
{
- return get_saturn_phase (JD);
+ return ln_get_saturn_phase (JD);
}
void Saturn::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_saturn_rect_helio (JD, position);
+ ln_get_saturn_rect_helio (JD, position);
}
void Saturn::set_render_jd (double JD)

58
astro/nova/files/patch-src__castor__sol.cc Normal file
View File

@ -0,0 +1,58 @@
--- src/castor/sol.cc.orig Sat Nov 5 12:06:25 2005
+++ src/castor/sol.cc Sat Nov 5 12:43:11 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "sol.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Sol::get_sdiam (double JD)
{
- return get_solar_sdiam(JD);
+ return ln_get_solar_sdiam(JD);
}
/*! \fn void Sol::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Sol::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn posn;
- get_equ_solar_coords(JD, &posn);
+ ln_get_solar_equ_coords(JD, &posn);
ra = posn.ra;
dec = posn.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ_posn;
- get_equ_solar_coords(JD, &equ_posn);
- get_hrz_from_equ (&equ_posn, observer, JD, posn);
+ ln_get_solar_equ_coords(JD, &equ_posn);
+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn);
}
/*! \fn void Sol::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Sol::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_solar_rst(JD, observer, time);
+ ln_get_solar_rst(JD, observer, time);
}
/*! \fn double Sol::get_mag()
@@ -100,7 +100,7 @@
void Sol::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD);
double sdiam = (get_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;

112
astro/nova/files/patch-src__castor__uranus.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/uranus.cc.orig Sat Nov 5 12:53:57 2005
+++ src/castor/uranus.cc Sat Nov 5 12:54:16 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "uranus.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Uranus::get_disk (double JD)
{
- return get_uranus_disk(JD);
+ return ln_get_uranus_disk(JD);
}
/*! \fn void Uranus::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Uranus::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_uranus_equ_coords (JD, &equ);
+ ln_get_uranus_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_uranus_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_uranus_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Uranus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Uranus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_uranus_rst(JD, observer, time);
+ ln_get_uranus_rst(JD, observer, time);
}
/*! \fn double Uranus::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_uranus_magnitude (JD);
+ return ln_get_uranus_magnitude (JD);
}
/*! \fn void Uranus::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Uranus::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_uranus_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_uranus_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -125,37 +125,37 @@
double Uranus::get_earth_dist (double JD)
{
- return get_uranus_earth_dist(JD);
+ return ln_get_uranus_earth_dist(JD);
}
double Uranus::get_sun_dist (double JD)
{
- return get_uranus_sun_dist(JD);
+ return ln_get_uranus_solar_dist(JD);
}
double Uranus::get_equ_sdiam (double JD)
{
- return get_uranus_sdiam(JD);
+ return ln_get_uranus_sdiam(JD);
}
double Uranus::get_pol_sdiam (double JD)
{
- return get_uranus_sdiam(JD);
+ return ln_get_uranus_sdiam(JD);
}
void Uranus::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_uranus_helio_coords (JD, position);
+ ln_get_uranus_helio_coords (JD, position);
}
double Uranus::get_phase (double JD)
{
- return get_uranus_phase (JD);
+ return ln_get_uranus_phase (JD);
}
void Uranus::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_uranus_rect_helio (JD, position);
+ ln_get_uranus_rect_helio (JD, position);
}
void Uranus::set_render_jd (double JD)

112
astro/nova/files/patch-src__castor__venus.cc Normal file
View File

@ -0,0 +1,112 @@
--- src/castor/venus.cc.orig Sat Nov 5 12:49:48 2005
+++ src/castor/venus.cc Sat Nov 5 12:51:06 2005
@@ -15,7 +15,7 @@
// Copyright 2003 Liam Girdwood
#include "venus.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Castor
{
@@ -30,7 +30,7 @@
double Venus::get_disk (double JD)
{
- return get_venus_disk(JD);
+ return ln_get_venus_disk(JD);
}
/*! \fn void Venus::get_equ_posn (double JD, ln_equ_posn* posn)
@@ -39,7 +39,7 @@
void Venus::get_equ_posn (double JD, double& ra, double& dec)
{
struct ln_equ_posn equ;
- get_venus_equ_coords (JD, &equ);
+ ln_get_venus_equ_coords (JD, &equ);
ra = equ.ra;
dec = equ.dec;
}
@@ -51,8 +51,8 @@
{
struct ln_equ_posn equ;
- get_venus_equ_coords (JD, &equ);
- get_hrz_from_equ (&equ, observer, JD, posn);
+ ln_get_venus_equ_coords (JD, &equ);
+ ln_get_hrz_from_equ (&equ, observer, JD, posn);
}
/*! \fn void Venus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
@@ -60,7 +60,7 @@
*/
void Venus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time)
{
- get_venus_rst(JD, observer, time);
+ ln_get_venus_rst(JD, observer, time);
}
/*! \fn double Venus::get_mag(double JD)
@@ -70,7 +70,7 @@
{
if (JD == 0)
JD = m_render_JD;
- return get_venus_magnitude (JD);
+ return ln_get_venus_magnitude (JD);
}
/*! \fn void Venus::get_id(std::string& id)
@@ -102,7 +102,7 @@
void Venus::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd)
{
// draw object on canvas
- double size = (mag_max + 1) - get_venus_magnitude(m_render_JD);
+ double size = (mag_max + 1) - ln_get_venus_magnitude(m_render_JD);
double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd;
if (size < sdiam)
size = sdiam;
@@ -125,37 +125,37 @@
double Venus::get_earth_dist (double JD)
{
- return get_venus_earth_dist(JD);
+ return ln_get_venus_earth_dist(JD);
}
double Venus::get_sun_dist (double JD)
{
- return get_venus_sun_dist(JD);
+ return ln_get_venus_solar_dist(JD);
}
double Venus::get_equ_sdiam (double JD)
{
- return get_venus_sdiam(JD);
+ return ln_get_venus_sdiam(JD);
}
double Venus::get_pol_sdiam (double JD)
{
- return get_venus_sdiam(JD);
+ return ln_get_venus_sdiam(JD);
}
void Venus::get_helio_coords (double JD, struct ln_helio_posn * position)
{
- get_venus_helio_coords (JD, position);
+ ln_get_venus_helio_coords (JD, position);
}
double Venus::get_phase (double JD)
{
- return get_venus_phase (JD);
+ return ln_get_venus_phase (JD);
}
void Venus::get_rect_helio (double JD, struct ln_rect_posn * position)
{
- get_venus_rect_helio (JD, position);
+ ln_get_venus_rect_helio (JD, position);
}
void Venus::set_render_jd (double JD)

11
astro/nova/files/patch-src_castor_astro_object.hh Normal file
View File

@ -0,0 +1,11 @@
--- src/castor/astro_object.hh.orig Sat Nov 5 01:00:59 2005
+++ src/castor/astro_object.hh Sat Nov 5 01:01:06 2005
@@ -19,7 +19,7 @@
#include <string>
#include <fstream>
-#include <libnova.h>
+#include <libnova/libnova.h>
#include <gdkmm/color.h>
#include <libgnomecanvasmm/group.h>

13
astro/nova/files/patch-src_castor_deep_object.cc Normal file
View File

@ -0,0 +1,13 @@
--- src/castor/deep_object.cc.orig Sat Nov 5 01:04:20 2005
+++ src/castor/deep_object.cc Sat Nov 5 01:04:58 2005
@@ -266,8 +266,8 @@
struct ln_hms hms;
struct ln_dms dms;
- deg_to_dms (m_dec, &dms);
- deg_to_hms (m_ra, &hms);
+ ln_deg_to_dms (m_dec, &dms);
+ ln_deg_to_hms (m_ra, &hms);
name.push_front(Glib::ustring("Dist(ly)"));
sprintf(temp, "%4.2f", m_distance_ly);

164
astro/nova/files/patch-src_gui_vsky_druid.cc Normal file
View File

@ -0,0 +1,164 @@
--- src/gui/vsky_druid.cc.orig Sat Nov 5 13:04:49 2005
+++ src/gui/vsky_druid.cc Sat Nov 5 13:07:03 2005
@@ -37,8 +37,8 @@
m_is_location_complete = false;
m_is_date_complete = false;
m_is_zone_complete = false;
- get_ln_date_from_sys(&m_date);
- m_JD = get_julian_from_sys();
+ ln_get_date_from_sys(&m_date);
+ m_JD = ln_get_julian_from_sys();
// create pages
create_page_start ();
@@ -738,7 +738,7 @@
double latitude;
m_lat.degrees = (int)m_lat_deg_spinbutton->get_value();
- latitude = dms_to_deg(&m_lat);
+ latitude = ln_dms_to_deg(&m_lat);
m_vsky->set_latitude(latitude);
}
@@ -747,7 +747,7 @@
double latitude;
m_lat.minutes = (int)m_lat_min_spinbutton->get_value();
- latitude = dms_to_deg(&m_lat);
+ latitude = ln_dms_to_deg(&m_lat);
m_vsky->set_latitude(latitude);
}
@@ -756,7 +756,7 @@
double latitude;
m_lat.seconds = m_lat_sec_spinbutton->get_value();
- latitude = dms_to_deg(&m_lat);
+ latitude = ln_dms_to_deg(&m_lat);
m_vsky->set_latitude(latitude);
}
@@ -765,7 +765,7 @@
double longitude;
m_long.degrees = (int)m_long_deg_spinbutton->get_value();
- longitude = dms_to_deg(&m_long);
+ longitude = ln_dms_to_deg(&m_long);
m_vsky->set_longitude(longitude);
}
@@ -774,7 +774,7 @@
double longitude;
m_long.minutes = (int)m_long_min_spinbutton->get_value();
- longitude = dms_to_deg(&m_long);
+ longitude = ln_dms_to_deg(&m_long);
m_vsky->set_longitude(longitude);
}
@@ -783,7 +783,7 @@
double longitude;
m_long.seconds = m_long_sec_spinbutton->get_value();
- longitude = dms_to_deg(&m_long);
+ longitude = ln_dms_to_deg(&m_long);
m_vsky->set_longitude(longitude);
}
@@ -851,7 +851,7 @@
m_date.years = (int)m_year_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -861,7 +861,7 @@
m_date.months = (int)m_month_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -871,7 +871,7 @@
m_date.days = (int)m_day_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -881,7 +881,7 @@
m_date.hours = (int)m_hours_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -891,7 +891,7 @@
m_date.minutes = (int)m_minutes_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -901,7 +901,7 @@
m_date.seconds = m_seconds_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -911,7 +911,7 @@
m_JD = m_julian_spinbutton->get_value();
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -938,7 +938,7 @@
m_use_another_date = false;
m_use_julian_date = true;
refresh_date();
- JD = get_julian_day(&m_date);
+ JD = ln_get_julian_day(&m_date);
m_vsky->set_jd(JD);
}
@@ -976,8 +976,8 @@
void VSkyDruid::refresh_date()
{
if (m_use_sys_date) {
- get_ln_date_from_sys(&m_date);
- m_JD = get_julian_from_sys();
+ ln_get_date_from_sys(&m_date);
+ m_JD = ln_get_julian_from_sys();
m_year_spinbutton->set_value(m_date.years);
m_month_spinbutton->set_value(m_date.months);
@@ -989,11 +989,11 @@
} else if (m_use_another_date) {
- m_JD = get_julian_day(&m_date);
+ m_JD = ln_get_julian_day(&m_date);
m_julian_spinbutton->set_value(m_JD);
} else {
- get_date(m_JD, &m_date);
+ ln_get_date(m_JD, &m_date);
m_year_spinbutton->set_value(m_date.years);
m_month_spinbutton->set_value(m_date.months);

11
astro/nova/files/patch-src_gui_vsky_druid.hh Normal file
View File

@ -0,0 +1,11 @@
--- src/gui/vsky_druid.hh.orig Sat Nov 5 13:04:15 2005
+++ src/gui/vsky_druid.hh Sat Nov 5 13:04:25 2005
@@ -37,7 +37,7 @@
#include <time.h>
#include <libgnomeuimm/druid.h>
#include "virtual_sky.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace GUI
{

33
astro/nova/files/patch-src_vega_sky_appbar.cc Normal file
View File

@ -0,0 +1,33 @@
--- src/vega/sky_appbar.cc.orig Sat Nov 5 13:03:00 2005
+++ src/vega/sky_appbar.cc Sat Nov 5 13:03:35 2005
@@ -16,7 +16,7 @@
#include "sky_appbar.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Vega
{
@@ -124,8 +124,8 @@
struct ln_dms hdec;
char text[32];
- deg_to_dms (dec, &hdec);
- deg_to_hms (ra, &hra);
+ ln_deg_to_dms (dec, &hdec);
+ ln_deg_to_hms (ra, &hra);
sprintf(text, "%2.2d", hra.hours);
m_equ_rah.set_text(text);
@@ -151,8 +151,8 @@
struct ln_dms halt, haz;
char text[32];
- deg_to_dms (alt, &halt);
- deg_to_dms (az, &haz);
+ ln_deg_to_dms (alt, &halt);
+ ln_deg_to_dms (az, &haz);
sprintf(text, "%2.2d", halt.degrees);
m_hrz_ald.set_text(text);

20
astro/nova/files/patch-src_vega_virtual_sky.cc Normal file
View File

@ -0,0 +1,20 @@
--- src/vega/virtual_sky.cc.orig Sat Nov 5 13:00:16 2005
+++ src/vega/virtual_sky.cc Sat Nov 5 13:02:23 2005
@@ -17,7 +17,7 @@
#include "virtual_sky.hh"
#include "astro_object.hh"
-#include <libnova.h>
+#include <libnova/libnova.h>
namespace Vega
{
@@ -430,7 +430,7 @@
m_projection->get_position(x, y, ra, dec);
equ.ra = ra;
equ.dec = dec;
- get_hrz_from_equ(&equ, &m_observer, m_JD, &hrz);
+ ln_get_hrz_from_equ(&equ, &m_observer, m_JD, &hrz);
m_appbar.set_hrz_posn(hrz.alt, hrz.az);
} else
m_appbar.set_hrz_posn(x,y);

11
astro/nova/files/patch-src_vega_virtual_sky.hh Normal file
View File

@ -0,0 +1,11 @@
--- src/vega/virtual_sky.hh.orig Sat Nov 5 13:01:44 2005
+++ src/vega/virtual_sky.hh Sat Nov 5 13:01:55 2005
@@ -28,7 +28,7 @@
#include "sky_spherical.hh"
#include "sky_appbar.hh"
#include <libxml++/libxml++.h>
-#include <libnova.h>
+#include <libnova/libnova.h>
/*! \namespace Vega
* \brief Nova Virtual Sky Engine

18
astro/nova/files/patch5-configure.in Normal file
View File

@ -0,0 +1,18 @@
--- configure.in.orig Sat Nov 5 13:26:00 2005
+++ configure.in Sat Nov 5 13:26:20 2005
@@ -138,12 +138,12 @@
# Set NOVA_PIXMAP_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${ac_default_prefix}/nova/pixmaps")
+ AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${ac_default_prefix}/share/nova/pixmaps")
NOVA_PIXMAP_DIR=${ac_default_prefix}/nova/pixmaps
AC_SUBST(NOVA_PIXMAP_DIR)
else
- AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${prefix}/nova/pixmaps")
- NOVA_PIXMAP_DIR=${prefix}/nova/pixmaps
+ AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${prefix}/share/nova/pixmaps")
+ NOVA_PIXMAP_DIR=${prefix}/share/nova/pixmaps
AC_SUBST(NOVA_PIXMAP_DIR)
fi