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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     85f95ebb04c5feecb722293529f5c5ef9da8a252
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 18:49:33 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 20:45:09 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=85f95ebb

sci-astronomy/kstars: Disable upstream messing around with any flags

Closes: https://bugs.gentoo.org/895892
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kstars/files/kstars-3.7.4-cmake.patch          | 62 ++++++++++++++++++++++
 sci-astronomy/kstars/kstars-9999.ebuild            |  4 ++
 2 files changed, 66 insertions(+)

diff --git a/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
new file mode 100644
index 0000000000..8306f1150f
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
@@ -0,0 +1,62 @@
+From 5c66594069b836e0fe806653e344f4e36d1e9c1e 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(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 091078e4c..af6ec66f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,7 +343,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")
+@@ -362,7 +362,7 @@ if (ANDROID)
+ endif ()
+ 
+ # Add security (hardening flags)
+-IF (UNIX OR APPLE OR ANDROID)
++IF (0)
+     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)
+ ENDIF ()
+ 
+ # Clang Format support
+-IF (UNIX OR APPLE)
++IF (0)
+     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 ()
+ 
+ SET(FIX_WARNINGS OFF CACHE BOOL "Enable strict compilation mode to turn compiler warnings to errors")
+ # Warning, debug and linker flags
+-IF (UNIX OR APPLE)
++IF (0)
+     SET(COMP_FLAGS "")
+     SET(LINKER_FLAGS "")
+     # Verbose warnings and turns all to errors
+@@ -479,7 +479,7 @@ ENDIF ()
+ 
+ # Sanitizer support
+ SET(SANITIZERS OFF CACHE BOOL "Sanitizer support for gcc and Clang")
+-IF (SANITIZERS AND
++IF (0 AND
+     ((UNIX AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR CMAKE_COMPILER_IS_GNUCXX) OR
+      (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
+

diff --git a/sci-astronomy/kstars/kstars-9999.ebuild b/sci-astronomy/kstars/kstars-9999.ebuild
index 7929ed1852..6fdea21591 100644
--- a/sci-astronomy/kstars/kstars-9999.ebuild
+++ b/sci-astronomy/kstars/kstars-9999.ebuild
@@ -80,6 +80,10 @@ CMAKE_SKIP_TESTS=(
 	TestEkos{Capture,FilterWheel,Focus,Mount,Scheduler{,Ops},Simulator}
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.4-cmake.patch" # bug 895892
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged