From 5de73f0b685d7c2d096e3d28a50f2e89ed68c52c Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Thu, 28 Apr 2022 23:13:55 +0200
Subject: [PATCH] package/stellarium: bump version to 0.22.1
Release notes:
http://stellarium.org/release/2022/04/16/stellarium-0.22.1.html
Removed backported patch.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
...uilding-Stellarium-without-scripting.patch | 49 -------------------
package/stellarium/stellarium.hash | 4 +-
package/stellarium/stellarium.mk | 2 +-
3 files changed, 3 insertions(+), 52 deletions(-)
delete mode 100644 package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch
diff --git a/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch b/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch
deleted file mode 100644
index 57f15a8eff..0000000000
--- a/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 710d1c5acd9e962260ce395474819ded2eb6ce12 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
-Date: Tue, 29 Mar 2022 18:57:06 +0700
-Subject: [PATCH] Fixed building Stellarium without scripting
-
-Downloaded from upstream commit:
-https://github.com/Stellarium/stellarium/commit/710d1c5acd9e962260ce395474819ded2eb6ce12
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- plugins/Calendars/src/Calendars.cpp | 2 ++
- plugins/Calendars/src/Calendars.hpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/plugins/Calendars/src/Calendars.cpp b/plugins/Calendars/src/Calendars.cpp
-index e5d89a4c063..4df6caee42e 100644
---- a/plugins/Calendars/src/Calendars.cpp
-+++ b/plugins/Calendars/src/Calendars.cpp
-@@ -251,6 +251,7 @@ void Calendars::init()
- }
- }
-
-+#ifdef ENABLE_SCRIPTING
- // Add calendar as scriptable object! Some scripting functions won't work though, as they use object types unknown to the scripting engine.
- void Calendars::makeCalendarsScriptable(StelScriptMgr *ssm)
- {
-@@ -260,6 +261,7 @@ void Calendars::makeCalendarsScriptable(StelScriptMgr *ssm)
- ssm->addObject(cal);
- }
- }
-+#endif
-
- void Calendars::loadSettings()
- {
-diff --git a/plugins/Calendars/src/Calendars.hpp b/plugins/Calendars/src/Calendars.hpp
-index 461ae1bd9ba..4696183d9d2 100644
---- a/plugins/Calendars/src/Calendars.hpp
-+++ b/plugins/Calendars/src/Calendars.hpp
-@@ -145,8 +145,10 @@ class Calendars : public StelModule
- //! TODO: ADD HERE: Chinese, NewHinduSolar, NewHinduLunar, ...
- Calendar* getCal(QString name);
-
-+ #ifdef ENABLE_SCRIPTING
- //! to be called after program startup, when StelScriptMgr has been set up.
- void makeCalendarsScriptable(StelScriptMgr *ssm);
-+ #endif
-
- signals:
- //void jdChanged(double jd);
diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash
index 2c2427bf0e..64238ad163 100644
--- a/package/stellarium/stellarium.hash
+++ b/package/stellarium/stellarium.hash
@@ -1,5 +1,5 @@
# From https://github.com/Stellarium/stellarium/releases
-sha1 c4a00fd756c66fb7df633f496dd3be4300bf1d2b stellarium-0.22.0.tar.gz
-sha256 0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885 stellarium-0.22.0.tar.gz
+sha1 55b5915dfb616b9748e1c2d2de6150f7159cf36c stellarium-0.22.1.tar.gz
+sha256 61a595ecc345dcc7517359573d0dc772e67ecaf6d52fefab142a77c92cf3fa24 stellarium-0.22.0.tar.gz
# Locally computed
sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING
diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk
index 1226b1190d..9c24263a43 100644
--- a/package/stellarium/stellarium.mk
+++ b/package/stellarium/stellarium.mk
@@ -4,7 +4,7 @@
#
################################################################################
-STELLARIUM_VERSION = 0.22.0
+STELLARIUM_VERSION = 0.22.1
STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION)
STELLARIUM_LICENSE = GPL-2.0+
STELLARIUM_LICENSE_FILES = COPYING