2 files changed, 5 insertions, 20 deletions
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
deleted file mode 100644
index a3356d8627e..00000000000
--- a/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
index 6d72e7c52d2..2d9a503d2b7 100644
--- a/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
+++ b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.1 2013/06/24 06:52:52 jperkin Exp $
+$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.2 2014/11/13 19:19:06 markd 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.orig	2014-10-23 21:53:08.000000000 +0000
 +++ src/plugins/render/stars/StarsPlugin.cpp
-@@ -23,6 +23,8 @@
- #include "SunLocator.h"
- #include "ViewportParams.h"
+@@ -34,6 +34,8 @@
+ 
+ #include "src/lib/astro/solarsystem.h"
  
 +#undef sun
 +