diff options
| author | jperkin <jperkin> | 2013-06-24 06:52:52 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-06-24 06:52:52 +0000 |
| commit | b9d8a1531bb84e99222369aa3b919af6cb5e5470 (patch) | |
| tree | 1c8cf3ca09a76817fc08d13e0e221035555ca139 /misc | |
| parent | f8a4c5ee4e17fe1a56d567fd10e5b10dcd754d50 (diff) | |
| download | pkgsrc-b9d8a1531bb84e99222369aa3b919af6cb5e5470.tar.gz | |
Fixes for SunOS.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/marble/distinfo | 4 | ||||
| -rw-r--r-- | misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h | 15 | ||||
| -rw-r--r-- | misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp | 15 |
3 files changed, 33 insertions, 1 deletions
diff --git a/misc/marble/distinfo b/misc/marble/distinfo index e9ef36d9b8d..510314cfd3a 100644 --- a/misc/marble/distinfo +++ b/misc/marble/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.5 2013/05/21 12:49:35 markd Exp $ +$NetBSD: distinfo,v 1.6 2013/06/24 06:52:52 jperkin Exp $ SHA1 (marble-4.10.3.tar.xz) = 814fffa64d91bec647c3f7e5cb130a2027dd6815 RMD160 (marble-4.10.3.tar.xz) = f8fe39d776d6d67b1f2b42bb17a8cf6868f08354 Size (marble-4.10.3.tar.xz) = 19449908 bytes +SHA1 (patch-src_plugins_render_satellites_mex_astrolib.h) = acc3477ca16f20f02c3fcdbb8285d9e9a3ec1706 +SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 0c12eb09d4bd7601236bde2e586000afd2fef18d diff --git a/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h b/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h new file mode 100644 index 00000000000..a3356d8627e --- /dev/null +++ b/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_plugins_render_satellites_mex_astrolib.h,v 1.1 2013/06/24 06:52:52 jperkin Exp $ + +Avoid 'sun' clash. + +--- src/plugins/render/satellites/mex/astrolib.h.orig 2013-05-03 04:38:26.036168912 +0000 ++++ src/plugins/render/satellites/mex/astrolib.h +@@ -13,6 +13,8 @@ + + #include "attlib.h" + ++#undef sun ++ + double ddd (int d, int m, double s); // deg, min, sec -> decimal degrees + void dms (double dd, int &d, int &m, double &s); // dec deg -> deg, min, sec + double mjd (int day, int month, int year, double hour); // modified Julian date diff --git a/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp new file mode 100644 index 00000000000..6d72e7c52d2 --- /dev/null +++ b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.1 2013/06/24 06:52:52 jperkin Exp $ + +Avoid 'sun' clash. + +--- src/plugins/render/stars/StarsPlugin.cpp.orig 2013-05-03 04:38:26.039168883 +0000 ++++ src/plugins/render/stars/StarsPlugin.cpp +@@ -23,6 +23,8 @@ + #include "SunLocator.h" + #include "ViewportParams.h" + ++#undef sun ++ + namespace Marble + { + |