commit: 692fdf63478d826dfe0e44f22c1d0681f5df1947 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 21 18:36:14 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 21 18:44:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692fdf63
sci-astronomy/kstars: Fix build Fixes f9138ef0b29d4418079faa14e9caaf0151fddadc Closes: https://bugs.gentoo.org/967604 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kstars/files/kstars-3.7.4-cmake.patch | 22 ++------------- .../kstars/files/kstars-3.8.0-cmake.patch | 31 ++++++++++++++++++++++ sci-astronomy/kstars/kstars-3.8.0.ebuild | 3 ++- 3 files changed, 35 insertions(+), 21 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 d055ae6e07e0..e8ae5374378f 100644 --- a/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch +++ b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch @@ -5,31 +5,13 @@ Subject: [PATCH] Thanks, but no thanks Signed-off-by: Andreas Sturmlechner <[email protected]> --- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3b591512..31071aeef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -345,7 +345,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII) - # Needed for htmesh, and libraw - kde_enable_exceptions() - --if (UNIX) -+if (0) - - # 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") -@@ -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 () diff --git a/sci-astronomy/kstars/files/kstars-3.8.0-cmake.patch b/sci-astronomy/kstars/files/kstars-3.8.0-cmake.patch new file mode 100644 index 000000000000..5e9e032daa9c --- /dev/null +++ b/sci-astronomy/kstars/files/kstars-3.8.0-cmake.patch @@ -0,0 +1,31 @@ +Pending upstream: https://invent.kde.org/education/kstars/-/merge_requests/1610 + +From d97b3acbf4fe055aad628a8f11002ad6d0bdb655 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 21 Dec 2025 18:57:49 +0100 +Subject: [PATCH] CMake: Drop obsolete silencing of warnings + +Should be unnecessary since at least ddd9f67a36f53852f31b465f707d4072e0a55e14. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b5bd9ed8..316711d65 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -358,10 +358,6 @@ add_definitions(-DQT_NO_CAST_TO_ASCII) + kde_enable_exceptions() + + if (UNIX) +- +- # 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") +- + # Optimize binary size by dropping unneeded symbols at linking stage + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -ffunction-sections") +-- +2.52.0 diff --git a/sci-astronomy/kstars/kstars-3.8.0.ebuild b/sci-astronomy/kstars/kstars-3.8.0.ebuild index 68df5543369a..a472eed03151 100644 --- a/sci-astronomy/kstars/kstars-3.8.0.ebuild +++ b/sci-astronomy/kstars/kstars-3.8.0.ebuild @@ -75,7 +75,8 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-3.7.4-cmake.patch # bug 895892, downstream patch - "${FILESDIR}"/${P}-gcc15.patch + "${FILESDIR}"/${P}-cmake.patch # MR #1610 pending upstream + "${FILESDIR}"/${P}-gcc15.patch # fixed in 3.8.1 ) src_configure() {
