29f718278b
Added upstream commit to fix build error. Switched to sha256 hash provided by upstream. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
57 lines
2.7 KiB
Diff
57 lines
2.7 KiB
Diff
From a5786f16b6330a4b6d4adb11e8d9bea23956977e Mon Sep 17 00:00:00 2001
|
|
From: Alexander Wolf <alex.v.wolf@gmail.com>
|
|
Date: Tue, 31 Mar 2020 16:49:15 +0700
|
|
Subject: [PATCH] Fix building Stellarium without scripting
|
|
|
|
Downloaded from upstream commit
|
|
https://github.com/Stellarium/stellarium/commit/a5786f16b6330a4b6d4adb11e8d9bea23956977e
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
plugins/NavStars/src/NavStars.cpp | 3 +--
|
|
src/gui/StelGui.cpp | 4 +++-
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/plugins/NavStars/src/NavStars.cpp b/plugins/NavStars/src/NavStars.cpp
|
|
index 7ef8cfb1d4..aa67bcc266 100644
|
|
--- a/plugins/NavStars/src/NavStars.cpp
|
|
+++ b/plugins/NavStars/src/NavStars.cpp
|
|
@@ -35,7 +35,6 @@
|
|
#include "NavStarsWindow.hpp"
|
|
#include "NavStarsCalculator.hpp"
|
|
#include "Planet.hpp"
|
|
-#include <StelMainScriptAPI.hpp>
|
|
|
|
#include <QList>
|
|
#include <QSharedPointer>
|
|
@@ -489,7 +488,7 @@ void NavStars::extraInfo(StelCore* core, const StelObjectP& selectedObject, bool
|
|
jde = core->getJDE();
|
|
|
|
NavStarsCalculator calc;
|
|
- calc.setUTC(StelMainScriptAPI::getDate("utc"))
|
|
+ calc.setUTC(StelUtils::julianDayToISO8601String(jd))
|
|
.setLatDeg(core->getCurrentLocation().latitude)
|
|
.setLonDeg(core->getCurrentLocation().longitude)
|
|
.setJd(jd)
|
|
diff --git a/src/gui/StelGui.cpp b/src/gui/StelGui.cpp
|
|
index 09ef4ba8ca..c2eb91b35a 100644
|
|
--- a/src/gui/StelGui.cpp
|
|
+++ b/src/gui/StelGui.cpp
|
|
@@ -225,13 +225,15 @@ void StelGui::init(QGraphicsWidget *atopLevelGraphicsWidget)
|
|
QString windowsGroup = N_("Windows");
|
|
QString miscGroup = N_("Miscellaneous");
|
|
actionsMgr->addAction("actionQuit_Global", miscGroup, N_("Quit"), this, "quit()", "Ctrl+Q", "Ctrl+X");
|
|
+
|
|
+#ifndef DISABLE_SCRIPTING
|
|
actionsMgr->addAction("actionIncrease_Script_Speed", datetimeGroup, N_("Speed up the script execution rate"), this, "increaseScriptSpeed()");
|
|
actionsMgr->addAction("actionDecrease_Script_Speed", datetimeGroup, N_("Slow down the script execution rate"), this, "decreaseScriptSpeed()");
|
|
actionsMgr->addAction("actionSet_Real_Script_Speed", datetimeGroup, N_("Set the normal script execution rate"), this, "setRealScriptSpeed()");
|
|
actionsMgr->addAction("actionStop_Script", datetimeGroup, N_("Stop script execution"), this, "stopScript()", "Ctrl+D, S");
|
|
actionsMgr->addAction("actionPause_Script", datetimeGroup, N_("Pause script execution"), this, "pauseScript()", "Ctrl+D, P");
|
|
actionsMgr->addAction("actionResume_Script", datetimeGroup, N_("Resume script execution"), this, "resumeScript()", "Ctrl+D, R");
|
|
-
|
|
+#endif
|
|
#ifdef ENABLE_SCRIPT_CONSOLE
|
|
actionsMgr->addAction("actionShow_ScriptConsole_Window_Global", windowsGroup, N_("Script console window"), scriptConsole, "visible", "F12", "", true);
|
|
#endif
|