[gentoo-commits] proj/kde:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/

[gentoo-commits] proj/kde:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/

[Andreas Sturmlechner]

commit:     ae264506891a55e5b53efad131a3f7cfb115df32
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  2 16:09:11 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  2 16:09:11 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae264506

sci-astronomy/kstars: Sync w/ ::gentoo, set KFMIN=6.9.0 and inherit xdg

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kstars/files/kstars-3.7.5-cmake.patch          | 26 ++++++++++++++++++++++
 sci-astronomy/kstars/kstars-9999.ebuild            | 10 ++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch b/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch
new file mode 100644
index 0000000000..229076f3c5
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch
@@ -0,0 +1,26 @@
+From 51e5aff74ecfa40975cfb851f7a64a684a0fee0d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 1 Feb 2025 22:32:10 +0100
+Subject: [PATCH] Cleanup bogus (un-ifdef'd and duplicated) headers
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ kstars/ekos/focus/focus.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
+index 553a94e6f..1193115eb 100644
+--- a/kstars/ekos/focus/focus.cpp
++++ b/kstars/ekos/focus/focus.cpp
+@@ -12,8 +12,6 @@
+ #if defined(HAVE_OPENCV)
+ #include "focusblurriness.h"
+ #endif
+-#include "aberrationinspector.h"
+-#include "aberrationinspectorutils.h"
+ #include "kstars.h"
+ #include "kstarsdata.h"
+ #include "Options.h"
+-- 
+2.48.1
+

diff --git a/sci-astronomy/kstars/kstars-9999.ebuild b/sci-astronomy/kstars/kstars-9999.ebuild
index 8e418d0233..27d691b4ad 100644
--- a/sci-astronomy/kstars/kstars-9999.ebuild
+++ b/sci-astronomy/kstars/kstars-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=6.5.0
+KFMIN=6.9.0
 QTMIN=6.7.2
-inherit ecm kde.org optfeature
+inherit ecm kde.org optfeature xdg
 
 DESCRIPTION="Desktop Planetarium"
 HOMEPAGE="https://apps.kde.org/kstars/ https://kstars.kde.org/"
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	sci-libs/gsl:=
 	>=sci-libs/indilib-2.0.2
 	sci-libs/libnova:=
-	>=sci-libs/stellarsolver-2.2
+	>=sci-libs/stellarsolver-2.6-r10
 	sys-libs/zlib
 	opencv? (
 		media-libs/opencv:=[ffmpeg]
@@ -81,7 +81,7 @@ CMAKE_SKIP_TESTS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.7.4-cmake.patch" # bug 895892
+	"${FILESDIR}"/${PN}-3.7.{4,5}-cmake.patch # bug 895892
 )
 
 src_configure() {
@@ -105,5 +105,5 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
 	fi
-	ecm_pkg_postinst
+	xdg_pkg_postinst
 }