diff --git a/kde-base/kstars/kstars-3.5.8.recipe b/kde-base/kstars/kstars-3.6.6.recipe similarity index 95% rename from kde-base/kstars/kstars-3.5.8.recipe rename to kde-base/kstars/kstars-3.6.6.recipe index a1282dc68..ca22da86e 100644 --- a/kde-base/kstars/kstars-3.5.8.recipe +++ b/kde-base/kstars/kstars-3.6.6.recipe @@ -8,11 +8,11 @@ For students and teachers, it supports adjustable simulation speeds in order to phenomena that happen over long timescales, the KStars Astrocalculator to predict \ conjunctions, and many common astronomical calculations." HOMEPAGE="https://edu.kde.org/kstars" -COPYRIGHT="2010-2022 KDE Organisation" +COPYRIGHT="2010-2023 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/kstars/kstars-$portVersion.tar.xz" -CHECKSUM_SHA256="660d902837b7abf3810d6e24f72fd84f0444a29bd7d43e1896b19fece1c88c3f" +CHECKSUM_SHA256="6783dab51bed2090687910c9258924053381fd1f91ee719d0d3dfc6df0128494" PATCHES="kstars-$portVersion.patchset" ADDITIONAL_FILES="kstars.rdef.in" @@ -25,6 +25,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libgsl$secondaryArchSuffix + lib:libgslcblas$secondaryArchSuffix lib:libkdeinit5_kded5$secondaryArchSuffix lib:libkdeinit5_klauncher$secondaryArchSuffix lib:libKF5Archive$secondaryArchSuffix @@ -78,8 +80,9 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 + extra_cmake_modules$secondaryArchSuffix devel:eigen$secondaryArchSuffix + devel:libgsl$secondaryArchSuffix devel:libkdeinit5_kded5$secondaryArchSuffix devel:libkdeinit5_klauncher$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix @@ -131,7 +134,7 @@ BUILD_PREREQUIRES=" cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python2 + cmd:python3 " BUILD() diff --git a/kde-base/kstars/patches/kstars-3.5.8.patchset b/kde-base/kstars/patches/kstars-3.6.6.patchset similarity index 68% rename from kde-base/kstars/patches/kstars-3.5.8.patchset rename to kde-base/kstars/patches/kstars-3.6.6.patchset index 52a5b5944..9a0dc4042 100644 --- a/kde-base/kstars/patches/kstars-3.5.8.patchset +++ b/kde-base/kstars/patches/kstars-3.6.6.patchset @@ -1,14 +1,14 @@ -From 7a4fa592b7294815a499ad1991095d26db5a1347 Mon Sep 17 00:00:00 2001 +From 309341ff0c5bf878178589f8a3f4a598b97d1bb7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 1 Nov 2021 11:59:42 +1000 -Subject: Fix build for Haiku +Date: Sun, 10 Mar 2024 21:32:29 +1000 +Subject: Fixes for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index a91683a..550d0c8 100644 +index 2a127d6..074fc29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -308,6 +308,19 @@ if (ANDROID) +@@ -296,6 +296,14 @@ if (ANDROID) endif () # Add security (hardening flags) @@ -17,18 +17,13 @@ index a91683a..550d0c8 100644 + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SEC_COMP_FLAGS}") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SEC_COMP_FLAGS}") + SET(SEC_LINK_FLAGS "-Wl,-z,nodump -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now") -+ IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -+ MESSAGE("++ 64 bit architecture") -+ SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} -pie") -+ SET(SEC_COMP_FLAGS "${SEC_COMP_FLAGS} -fPIE") -+ ENDIF() + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SEC_LINK_FLAGS}") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SEC_LINK_FLAGS}") +ELSE () IF (UNIX OR APPLE OR ANDROID) SET(SEC_COMP_FLAGS "-D_FORTIFY_SOURCE=2 -fstack-protector-all -Wcast-align -fPIE") IF (NOT ANDROID AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) -@@ -329,6 +342,7 @@ IF (UNIX OR APPLE OR ANDROID) +@@ -317,6 +325,7 @@ IF (UNIX OR APPLE OR ANDROID) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SEC_LINK_FLAGS}") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SEC_LINK_FLAGS}") ENDIF () @@ -36,23 +31,17 @@ index a91683a..550d0c8 100644 # Clang Format support IF (UNIX OR APPLE) -@@ -460,9 +474,11 @@ IF (NOT ANDROID) - ki18n_install("${CMAKE_CURRENT_BINARY_DIR}/po") - else() - ki18n_install(po) -- find_package(KF5DocTools CONFIG) -- if(KF5DocTools_FOUND) -- kdoctools_install(po) -+ if (BUILD_DOC) -+ find_package(KF5DocTools CONFIG) -+ if(KF5DocTools_FOUND) -+ kdoctools_install(po) -+ endif() - endif() - endif() - ENDIF () +@@ -438,7 +447,7 @@ include_directories(utils) + add_subdirectory(kstars) + add_subdirectory(datahandlers) + +-IF (NOT ANDROID) ++IF (NOT ANDROID AND NOT HAIKU) + IF (BUILD_TESTING) + enable_testing(true) + add_subdirectory(Tests) diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp -index caa36c3..8f06517 100644 +index e636e05..67deb9c 100644 --- a/kstars/auxiliary/thememanager.cpp +++ b/kstars/auxiliary/thememanager.cpp @@ -140,9 +140,11 @@ void Manager::slotChangePalette() @@ -80,7 +69,7 @@ index caa36c3..8f06517 100644 else { if (qgetenv("XDG_CURRENT_DESKTOP") != "KDE") -@@ -400,6 +406,12 @@ void Manager::setIconTheme(IconTheme theme) +@@ -398,6 +404,12 @@ void Manager::setIconTheme(IconTheme theme) QString resourcePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory) + QDir::separator() + iconTheme + QDir::separator() + rccFile; QResource::registerResource(resourcePath, "/icons/" + iconTheme); @@ -106,6 +95,41 @@ index ca6eeb1..d29faa6 100644 ~Manager(); static Manager* instance(); +diff --git a/kstars/dialogs/finddialog.cpp b/kstars/dialogs/finddialog.cpp +index 77df85c..f80659e 100644 +--- a/kstars/dialogs/finddialog.cpp ++++ b/kstars/dialogs/finddialog.cpp +@@ -575,7 +575,7 @@ void FindDialog::slotDetails() + { + if (selectedObject()) + { +- QPointer dd = new DetailDialog(selectedObject(), KStarsData::Instance()->ut(), ++ DetailDialog *dd = new DetailDialog(selectedObject(), KStarsData::Instance()->ut(), + KStarsData::Instance()->geo(), KStars::Instance()); + dd->exec(); + delete dd; +diff --git a/kstars/dialogs/fovdialog.cpp b/kstars/dialogs/fovdialog.cpp +index d457279..4cfbf96 100644 +--- a/kstars/dialogs/fovdialog.cpp ++++ b/kstars/dialogs/fovdialog.cpp +@@ -129,7 +129,7 @@ void FOVDialog::slotSelect(int irow) + + void FOVDialog::slotNewFOV() + { +- QPointer newfdlg = new NewFOV(this); ++ NewFOV *newfdlg = new NewFOV(this); + if (newfdlg->exec() == QDialog::Accepted) + { + FOV *newfov = new FOV(newfdlg->getFOV()); +@@ -149,7 +149,7 @@ void FOVDialog::slotEditFOV() + FOV *f = item->data(Qt::UserRole).value(); + + // Create dialog +- QPointer newfdlg = new NewFOV(this, f); ++ NewFOV *newfdlg = new NewFOV(this, f); + if (newfdlg->exec() == QDialog::Accepted) + { + // Overwrite FOV diff --git a/kstars/htmesh/SpatialGeneral.h b/kstars/htmesh/SpatialGeneral.h index d87c9b0..09d6ae9 100644 --- a/kstars/htmesh/SpatialGeneral.h @@ -120,30 +144,22 @@ index d87c9b0..09d6ae9 100644 #endif diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp -index ecc52c1..6d170c7 100644 +index 941e939..379d628 100644 --- a/kstars/kstars.cpp +++ b/kstars/kstars.cpp -@@ -60,7 +60,7 @@ KStars::KStars(bool doSplash, bool clockrun, const QString &startdate) +@@ -61,8 +61,9 @@ KStars::KStars(bool doSplash, bool clockrun, const QString &startdate) setWindowTitle(i18nc("@title:window", "KStars")); // Set thread stack size to 32MB --#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) -+#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) && !defined(Q_OS_HAIKU) ++#ifndef Q_OS_HAIKU QThreadPool::globalInstance()->setStackSize(33554432); - #endif - --- -2.30.2 - - -From 3b9dfa4003ceadc676eb8b581522f2a2ab40bbee Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 10 May 2022 21:40:56 +1000 -Subject: Use software QML renderer - - +- ++#endif + // Initialize logging settings + if (Options::disableLogging()) + KSUtils::Logging::Disable(); diff --git a/kstars/main.cpp b/kstars/main.cpp -index 59bdf5c..5a70c94 100644 +index 547f1c2..8609577 100644 --- a/kstars/main.cpp +++ b/kstars/main.cpp @@ -56,6 +56,10 @@ Q_DECL_EXPORT @@ -158,5 +174,5 @@ index 59bdf5c..5a70c94 100644 // Ignore SIGPIPE signal(SIGPIPE, SIG_IGN); -- -2.30.2 +2.43.2