sci-astronomy/kstars: update patches, dependencies

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

3 files changed, 24 insertions, 41 deletions

diff --git a/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
index 8306f1150f7..d055ae6e07e 100644
--- a/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
+++ b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
@@ -1,18 +1,18 @@
-From 5c66594069b836e0fe806653e344f4e36d1e9c1e Mon Sep 17 00:00:00 2001
+From 7e5a75da29016e533d59971ba84931b33e072a81 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Tue, 3 Dec 2024 19:46:01 +0100
 Subject: [PATCH] Thanks, but no thanks
 
 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
- CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 091078e4c..af6ec66f4 100644
+index a3b591512..31071aeef 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -343,7 +343,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII)
+@@ -345,7 +345,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII)
  # Needed for htmesh, and libraw
  kde_enable_exceptions()
  
@@ -21,7 +21,16 @@ index 091078e4c..af6ec66f4 100644
  
    # TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
-@@ -362,7 +362,7 @@ if (ANDROID)
+@@ -355,7 +355,7 @@ if (UNIX)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -ffunction-sections")
+     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
+   endif()
+-endif(UNIX)
++endif()
+ 
+ # Optimize binary size by dropping unneeded symbols at linking stage
+ if (ANDROID)
+@@ -364,7 +364,7 @@ if (ANDROID)
  endif ()
  
  # Add security (hardening flags)
@@ -30,7 +39,7 @@ index 091078e4c..af6ec66f4 100644
      SET(SEC_COMP_FLAGS "${SEC_COMP_FLAGS} -fstack-protector-all -Wcast-align -fPIE")
      # This is ill-defined, but I searched for a solution for quite a long time to no avail
      # - FORTIFY_SOURCE generates a warning when there is no code optimization, and warnings will become errors at some point
-@@ -394,7 +394,7 @@ IF (UNIX OR APPLE OR ANDROID)
+@@ -396,7 +396,7 @@ IF (UNIX OR APPLE OR ANDROID)
  ENDIF ()
  
  # Clang Format support
@@ -39,7 +48,7 @@ index 091078e4c..af6ec66f4 100644
      SET(FORMAT_CODE OFF CACHE BOOL "Enable Clang Format")
      IF (FORMAT_CODE MATCHES ON)
          FILE(GLOB_RECURSE ALL_SOURCE_FILES *.c *.cpp *.h)
-@@ -415,7 +415,7 @@ ENDIF ()
+@@ -417,7 +417,7 @@ ENDIF ()
  
  SET(FIX_WARNINGS OFF CACHE BOOL "Enable strict compilation mode to turn compiler warnings to errors")
  # Warning, debug and linker flags
@@ -48,7 +57,7 @@ index 091078e4c..af6ec66f4 100644
      SET(COMP_FLAGS "")
      SET(LINKER_FLAGS "")
      # Verbose warnings and turns all to errors
-@@ -479,7 +479,7 @@ ENDIF ()
+@@ -481,7 +481,7 @@ ENDIF ()
  
  # Sanitizer support
  SET(SANITIZERS OFF CACHE BOOL "Sanitizer support for gcc and Clang")
@@ -58,5 +67,5 @@ index 091078e4c..af6ec66f4 100644
       (APPLE AND (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_COMPILER_IS_GNUCXX))))
      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address,undefined -fno-omit-frame-pointer")
 -- 
-2.47.1
+2.51.0
 
diff --git a/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch b/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch
deleted file mode 100644
index 229076f3c5a..00000000000
--- a/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 27d691b4ad2..4c406862d8e 100644
--- a/sci-astronomy/kstars/kstars-9999.ebuild
+++ b/sci-astronomy/kstars/kstars-9999.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 KFMIN=6.9.0
-QTMIN=6.7.2
+QTMIN=6.8.1
 inherit ecm kde.org optfeature xdg
 
 DESCRIPTION="Desktop Planetarium"
@@ -47,7 +46,7 @@ COMMON_DEPEND="
 	sci-libs/gsl:=
 	>=sci-libs/indilib-2.0.2
 	sci-libs/libnova:=
-	>=sci-libs/stellarsolver-2.6-r10
+	>=sci-libs/stellarsolver-2.7
 	sys-libs/zlib
 	opencv? (
 		media-libs/opencv:=[ffmpeg]
@@ -81,14 +80,15 @@ CMAKE_SKIP_TESTS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.{4,5}-cmake.patch # bug 895892
+	# downstream patch
+	"${FILESDIR}"/${PN}-3.7.4-cmake.patch # bug 895892
 )
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged
+		-DBUILD_WITH_QT6=ON # KF6 please
 		-DBUILD_QT5=OFF # KF6 please
-		-DBUILD_DOC=$(usex handbook)
 		$(cmake_use_find_package opencv OpenCV)
 		$(cmake_use_find_package password Qt6Keychain)
 		$(cmake_use_find_package raw LibRaw)