Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -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
+