Neither of these changes are in the code on github because these chunks
of code are no where to be found (even in history). Regardless builds
and runs here now.
Advertising
- Matthew Martin
diff --git Makefile Makefile
index 5d8943d5330..2b18df5a1af 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
COMMENT= free space simulator and planetarium
DISTNAME= celestia-1.6.1
-REVISION= 12
+REVISION= 13
CATEGORIES= astro x11
diff --git patches/patch-src_celestia_celestiacore_cpp
patches/patch-src_celestia_celestiacore_cpp
index a2195a5dc9c..0c701fdf16d 100644
--- patches/patch-src_celestia_celestiacore_cpp
+++ patches/patch-src_celestia_celestiacore_cpp
@@ -1,6 +1,16 @@
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.5 2011/07/09 01:41:13
ajacoutot Exp $
---- src/celestia/celestiacore.cpp.orig Sun Jun 5 18:11:13 2011
-+++ src/celestia/celestiacore.cpp Sat Jul 9 03:23:48 2011
+Index: src/celestia/celestiacore.cpp
+--- src/celestia/celestiacore.cpp.orig
++++ src/celestia/celestiacore.cpp
+@@ -439,7 +439,7 @@ void CelestiaCore::activateFavorite(FavoritesEntry& fa
+ sim->setTime(fav.jd);
+ sim->setObserverPosition(fav.position);
+ sim->setObserverOrientation(fav.orientation);
+- if (fav.fov != NULL)
++ if (fav.fov != 0)
+ {
+ sim->getActiveObserver()->setFOV(fav.fov);
+ setZoomFromFOV();
@@ -4103,7 +4103,7 @@ bool CelestiaCore::initSimulation(const string* config
}
else
diff --git patches/patch-src_celestia_favorites_cpp
patches/patch-src_celestia_favorites_cpp
new file mode 100644
index 00000000000..039a7af4e61
--- /dev/null
+++ patches/patch-src_celestia_favorites_cpp
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/celestia/favorites.cpp
+--- src/celestia/favorites.cpp.orig
++++ src/celestia/favorites.cpp
+@@ -80,7 +80,7 @@ FavoritesList* ReadFavoritesList(istream& in)
+
+ // Get fov
+ if (!favParams->getNumber("fov", fav->fov))
+- fav->fov = NULL;
++ fav->fov = 0;
+
+ // Get time
+ fav->jd = 0.0;
+@@ -137,7 +137,7 @@ void WriteFavoritesList(FavoritesList& favorites, ostr
+ out << "\tangle " << angle << '\n';
+ out << setprecision(16);
+ out << "\ttime " << fav->jd << '\n';
+- if (fav->fov != NULL)
++ if (fav->fov != 0)
+ out << "\tfov " << fav->fov << '\n';
+ out << "\tselection \"" << fav->selectionName << "\"\n";
+ out << "\tcoordsys \"";
