From 7aaab12345fcd592c2aebe76da1b61329f2886c5 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Wed, 10 Dec 2025 09:30:33 +0000 Subject: [PATCH] Update kstars to 3.8.0 --- astro/kstars/Makefile | 2 +- astro/kstars/distinfo | 4 ++-- .../patch-kstars_ekos_focus_exposurewidget_cpp | 11 ----------- ...tars_ekos_guide_internalguide_guidestars_cpp | 12 ------------ ...tch-kstars_skycomponents_deepstarcomponent_h | 11 +++++++++++ .../patch-kstars_skycomponents_starblock_cpp | 13 +++++++++++++ ...atch-kstars_skycomponents_starblockfactory_h | 11 +++++++++++ astro/kstars/pkg/PLIST | 17 +++++++++++++++++ 8 files changed, 55 insertions(+), 26 deletions(-) delete mode 100644 astro/kstars/patches/patch-kstars_ekos_focus_exposurewidget_cpp delete mode 100644 astro/kstars/patches/patch-kstars_ekos_guide_internalguide_guidestars_cpp create mode 100644 astro/kstars/patches/patch-kstars_skycomponents_deepstarcomponent_h create mode 100644 astro/kstars/patches/patch-kstars_skycomponents_starblock_cpp create mode 100644 astro/kstars/patches/patch-kstars_skycomponents_starblockfactory_h diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index 03a91aeb88e..23d54fdbdca 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -2,7 +2,7 @@ USE_NOBTCFI-aarch64 = Yes# fortran COMMENT = planetarium simulator for KDE -V = 3.7.8 +V = 3.8.0 DISTNAME = kstars-${V} EPOCH = 0 diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo index edc6dc11151..8965c837342 100644 --- a/astro/kstars/distinfo +++ b/astro/kstars/distinfo @@ -1,2 +1,2 @@ -SHA256 (kstars-3.7.8.tar.xz) = VbOu8p7Bq6UJBr05PVZein4LWzpdLo4838G1jXGNLAw= -SIZE (kstars-3.7.8.tar.xz) = 50942300 +SHA256 (kstars-3.8.0.tar.xz) = npB0maYIdAZgHBVZqQ9lUe9VfvRkI3E1WSnG7RIYje4= +SIZE (kstars-3.8.0.tar.xz) = 51561840 diff --git a/astro/kstars/patches/patch-kstars_ekos_focus_exposurewidget_cpp b/astro/kstars/patches/patch-kstars_ekos_focus_exposurewidget_cpp deleted file mode 100644 index 01e2595e3b5..00000000000 --- a/astro/kstars/patches/patch-kstars_ekos_focus_exposurewidget_cpp +++ /dev/null @@ -1,11 +0,0 @@ -https://github.com/KDE/kstars/commit/ce53888e6dbaeb1b9239fca55288b5ead969b5a7 -Index: kstars/ekos/focus/exposurewidget.cpp ---- kstars/ekos/focus/exposurewidget.cpp.orig -+++ kstars/ekos/focus/exposurewidget.cpp -@@ -28,5 +28,5 @@ QString ExposureWidget::textFromValue(double value) co - count++; - v *= 10; - } -- return QWidget::locale().toString(value, u'f', std::max(3, count)); -+ return QWidget::locale().toString(value, static_cast(u'f'), std::max(3, count)); - } diff --git a/astro/kstars/patches/patch-kstars_ekos_guide_internalguide_guidestars_cpp b/astro/kstars/patches/patch-kstars_ekos_guide_internalguide_guidestars_cpp deleted file mode 100644 index 8e7ab88b1c0..00000000000 --- a/astro/kstars/patches/patch-kstars_ekos_guide_internalguide_guidestars_cpp +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/KDE/kstars/commit/ce53888e6dbaeb1b9239fca55288b5ead969b5a7 -Index: kstars/ekos/guide/internalguide/guidestars.cpp ---- kstars/ekos/guide/internalguide/guidestars.cpp.orig -+++ kstars/ekos/guide/internalguide/guidestars.cpp -@@ -17,6 +17,7 @@ - #undef Const - #include "ekos/auxiliary/stellarsolverprofileeditor.h" - #include -+#include - - #define DLOG if (false) qCDebug - diff --git a/astro/kstars/patches/patch-kstars_skycomponents_deepstarcomponent_h b/astro/kstars/patches/patch-kstars_skycomponents_deepstarcomponent_h new file mode 100644 index 00000000000..43849a80173 --- /dev/null +++ b/astro/kstars/patches/patch-kstars_skycomponents_deepstarcomponent_h @@ -0,0 +1,11 @@ +Index: kstars/skycomponents/deepstarcomponent.h +--- kstars/skycomponents/deepstarcomponent.h.orig ++++ kstars/skycomponents/deepstarcomponent.h +@@ -21,6 +21,7 @@ + #include "starblockfactory.h" + #include "skyobjects/deepstardata.h" + #include "skyobjects/stardata.h" ++#include "skyobjects/starobject.h" + + class SkyLabeler; + class SkyMesh; diff --git a/astro/kstars/patches/patch-kstars_skycomponents_starblock_cpp b/astro/kstars/patches/patch-kstars_skycomponents_starblock_cpp new file mode 100644 index 00000000000..80a0cce7793 --- /dev/null +++ b/astro/kstars/patches/patch-kstars_skycomponents_starblock_cpp @@ -0,0 +1,13 @@ +Index: kstars/skycomponents/starblock.cpp +--- kstars/skycomponents/starblock.cpp.orig ++++ kstars/skycomponents/starblock.cpp +@@ -6,8 +6,8 @@ + + #include + +-#include "starblock.h" + #include "skyobjects/starobject.h" ++#include "starblock.h" + #include "starcomponent.h" + #include "skyobjects/stardata.h" + #include "skyobjects/deepstardata.h" diff --git a/astro/kstars/patches/patch-kstars_skycomponents_starblockfactory_h b/astro/kstars/patches/patch-kstars_skycomponents_starblockfactory_h new file mode 100644 index 00000000000..e6c35c298c6 --- /dev/null +++ b/astro/kstars/patches/patch-kstars_skycomponents_starblockfactory_h @@ -0,0 +1,11 @@ +Index: kstars/skycomponents/starblockfactory.h +--- kstars/skycomponents/starblockfactory.h.orig ++++ kstars/skycomponents/starblockfactory.h +@@ -7,6 +7,7 @@ + #pragma once + + #include "typedef.h" ++#include "skyobjects/starobject.h" + + class StarBlock; + diff --git a/astro/kstars/pkg/PLIST b/astro/kstars/pkg/PLIST index 369193bd1f2..7585addf73a 100644 --- a/astro/kstars/pkg/PLIST +++ b/astro/kstars/pkg/PLIST @@ -97,6 +97,8 @@ share/kstars/earth.R4.vsop share/kstars/earth.R5.vsop share/kstars/earth.orbit share/kstars/ekoslive.png +share/kstars/fr/ +share/kstars/fr/info_url.dat share/kstars/geomap.jpg share/kstars/glossary.xml share/kstars/image_url.dat @@ -434,6 +436,8 @@ share/kstars/moonB.dat share/kstars/moonLR.dat share/kstars/moonless-night.colors share/kstars/namedstars.dat +share/kstars/nds/ +share/kstars/nds/info_url.dat share/kstars/neptune.B0.vsop share/kstars/neptune.B1.vsop share/kstars/neptune.B2.vsop @@ -578,6 +582,19 @@ share/kstars/smc.dat share/kstars/starlnum.idx share/kstars/starnames.dat share/kstars/stars.dat +share/kstars/taskqueue/ +share/kstars/taskqueue/collections/ +share/kstars/taskqueue/collections/observatory_shutdown.json +share/kstars/taskqueue/collections/observatory_startup.json +share/kstars/taskqueue/templates/ +share/kstars/taskqueue/templates/README.md +share/kstars/taskqueue/templates/system/ +share/kstars/taskqueue/templates/system/camera.json +share/kstars/taskqueue/templates/system/delay.json +share/kstars/taskqueue/templates/system/dome.json +share/kstars/taskqueue/templates/system/dustcap.json +share/kstars/taskqueue/templates/system/mount.json +share/kstars/taskqueue/templates/system/script.json share/kstars/textures/ share/kstars/textures/defaultflag.png share/kstars/textures/galaxy-cluster.png