KStars: bump version

2026-05-05 22:48:55 +02:00 · 2021-11-01 13:28:07 +10:00
parent 7330d87da2
commit 4c051898d8
2 changed files with 40 additions and 88 deletions
--- a/kde-base/kstars/kstars-3.5.5.recipe
+++ b/kde-base/kstars/kstars-3.5.5.recipe
@@ -8,15 +8,15 @@ 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-2020 KDE Organisation"
+COPYRIGHT="2010-2021 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/kstars/kstars-$portVersion.tar.xz"
-CHECKSUM_SHA256="a1aa6e859b90bedcf88664c13e0cdfef6407aca1ee6eef608310d8a5caa9f33a"
+CHECKSUM_SHA256="703df56050672af10fc8142296ceaa27134a6a00e8222f3f6677f18ff1ac6b43"
 PATCHES="kstars-$portVersion.patchset"
 ADDITIONAL_FILES="kstars.rdef.in"

-ARCHITECTURES="all ?x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
@@ -78,7 +78,7 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.65
+	extra_cmake_modules$secondaryArchSuffix >= 5.86
 	devel:eigen$secondaryArchSuffix
 	devel:libkdeinit5_kded5$secondaryArchSuffix
 	devel:libkdeinit5_klauncher$secondaryArchSuffix
--- a/kde-base/kstars/patches/kstars-3.5.5.patchset
+++ b/kde-base/kstars/patches/kstars-3.5.5.patchset
@@ -1,14 +1,14 @@
-From 51c65d63f76d559e33bd41dc99d4cccd529d7a41 Mon Sep 17 00:00:00 2001
+From 7d61173d5c416f707804c7ffad6b2aaea32f3a3d Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 25 Nov 2020 00:55:17 +1000
+Date: Mon, 1 Nov 2021 11:59:42 +1000
 Subject: Fix build for Haiku


 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3ed7c9..ca02407 100644
+index aada9ad..4d14564 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -302,6 +302,19 @@ if (ANDROID)
+@@ -312,6 +312,19 @@ if (ANDROID)
 endif ()
 
 # Add security (hardening flags)
@@ -28,7 +28,7 @@ index a3ed7c9..ca02407 100644
 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)
-@@ -323,6 +336,7 @@ IF (UNIX OR APPLE OR ANDROID)
+@@ -333,6 +346,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,38 +36,28 @@ index a3ed7c9..ca02407 100644
 
 # Clang Format support
 IF (UNIX OR APPLE)
-@@ -440,7 +454,7 @@ endif()
- 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/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp
-index 984ce25..3e0438b 100644
--- a/datahandlers/catalogdb.cpp
-+++ b/datahandlers/catalogdb.cpp
-@@ -913,6 +913,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
-     //     qWarning() << get_query.lastError();
-     //     qWarning() << FindCatalog(catalog);
- 
-+#if defined(__x86_64__) && defined(__HAIKU__)
-+	if (FindCatalog(catalog) < 0)
-+		return;
-+#endif
-+
-     if (!get_query.exec())
-     {
-         qWarning() << get_query.lastQuery();
+@@ -464,9 +478,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 ()
 diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp
-index 6140a9a..399f2a4 100644
+index ffe7dba..c99fb52 100644
 --- a/kstars/auxiliary/thememanager.cpp
 +++ b/kstars/auxiliary/thememanager.cpp
-@@ -153,9 +153,11 @@ void Manager::slotChangePalette()
- 
-     if (theme == "Macintosh" || theme == "White Balance" || theme == "High Key" || (theme == "Default" && currentDesktopdefaultTheme().contains("Dark") == false))
+@@ -154,9 +154,11 @@ void Manager::slotChangePalette()
+     if (theme == "Macintosh" || theme == "White Balance" || theme == "High Key" || (theme == "Default"
+             && currentDesktopdefaultTheme().contains("Dark") == false))
         themeIconType = BREEZE_THEME;
 -
 +#if defined(Q_OS_HAIKU)
@@ -79,7 +69,7 @@ index 6140a9a..399f2a4 100644
     QString filename        = d->themeMap.value(theme);
     KSharedConfigPtr config = KSharedConfig::openConfig(filename);
     // hint for the style to synchronize the color scheme with the window manager/compositor
-@@ -177,6 +179,10 @@ void Manager::slotChangePalette()
+@@ -178,6 +180,10 @@ void Manager::slotChangePalette()
 
     if(theme == "Macintosh")
         qApp->setStyle(QStyleFactory::create("macintosh"));
@@ -88,11 +78,11 @@ index 6140a9a..399f2a4 100644
 +		qApp->setStyle(QStyleFactory::create("haiku"));
 +#endif
     else
-         qApp->setStyle(QStyleFactory::create("Fusion"));
- 
-@@ -408,6 +414,12 @@ void Manager::setIconTheme(IconTheme theme)
-     themeSearchPaths = themeSearchPaths << QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory);
-     QString resourcePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory) + QDir::separator() + iconTheme + QDir::separator() + rccFile;
+     {
+         if (qgetenv("XDG_CURRENT_DESKTOP") != "KDE")
+@@ -414,6 +420,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);
 +#elif defined(Q_OS_HAIKU)
 +	if (theme == SYSTEM_THEME)
@@ -130,11 +120,11 @@ index fa3ae42..660498a 100644
 #endif
 
 diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp
-index 9c5bd5a..861de0c 100644
+index 3796dc8..46ff7be 100644
 --- a/kstars/kstars.cpp
 +++ b/kstars/kstars.cpp
@@ -71,7 +71,7 @@ KStars::KStars(bool doSplash, bool clockrun, const QString &startdate)
-     setWindowTitle(i18n("KStars"));
+     setWindowTitle(i18nc("@title:window", "KStars"));
 
     // Set thread stack size to 32MB
 -#if QT_VERSION >= QT_VERSION_CHECK(5,10,0)
@@ -143,43 +133,5 @@ index 9c5bd5a..861de0c 100644
 #endif
 
 -- 
-2.28.0
-
-
-From c42063e74a568cb59dde94102d7221acee40df48 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 29 Dec 2020 20:34:57 +1000
-Subject: Disable build docs
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca02407..992c895 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -454,7 +454,7 @@ endif()
- add_subdirectory(kstars)
- add_subdirectory(datahandlers)
- 
-IF (NOT ANDROID AND NOT HAIKU)
-+IF (NOT ANDROID)
-     IF (BUILD_TESTING)
-     enable_testing(true)
-     add_subdirectory(Tests)
-@@ -464,9 +464,11 @@ IF (NOT ANDROID AND NOT HAIKU)
-         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 ()
-- 
-2.28.0
+2.30.2