KStars: bump version

kde-base/kstars/kstars-3.5.0.recipe

@@ -12,7 +12,7 @@ COPYRIGHT="2010-2020 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/kstars/kstars-$portVersion.tar.xz"
-CHECKSUM_SHA256="c81119a85e9265991dd0fbfafdc6ba797bf3bedce64f4d5260511bafccebbe48"
+CHECKSUM_SHA256="a1aa6e859b90bedcf88664c13e0cdfef6407aca1ee6eef608310d8a5caa9f33a"
 PATCHES="kstars-$portVersion.patchset"
 ADDITIONAL_FILES="kstars.rdef.in"
 

kde-base/kstars/patches/kstars-3.5.0.patchset

@@ -1,14 +1,14 @@
-From d4a56807138b5d70a65643c5f820cf98b1979df6 Mon Sep 17 00:00:00 2001
+From f03b3410bd9939d7c75a22a330a80c39dc931ab5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Fri, 1 May 2020 17:54:01 +1000
+Date: Wed, 25 Nov 2020 00:55:17 +1000
 Subject: Fix build for Haiku
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a7bc20..5bcf506 100644
+index a3ed7c9..ca02407 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -296,6 +296,19 @@ if (ANDROID)
+@@ -302,6 +302,19 @@ if (ANDROID)
  endif ()
  
  # Add security (hardening flags)
@@ -28,7 +28,7 @@ index 6a7bc20..5bcf506 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)
-@@ -317,6 +330,7 @@ IF (UNIX OR APPLE OR ANDROID)
+@@ -323,6 +336,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,7 +36,7 @@ index 6a7bc20..5bcf506 100644
  
  # Clang Format support
  IF (UNIX OR APPLE)
-@@ -434,7 +448,7 @@ endif()
+@@ -440,7 +454,7 @@ endif()
  add_subdirectory(kstars)
  add_subdirectory(datahandlers)
  
@@ -46,10 +46,10 @@ index 6a7bc20..5bcf506 100644
      enable_testing(true)
      add_subdirectory(Tests)
 diff --git a/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp
-index 1718342..a76c208 100644
+index 984ce25..3e0438b 100644
 --- a/datahandlers/catalogdb.cpp
 +++ b/datahandlers/catalogdb.cpp
-@@ -906,6 +906,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
+@@ -913,6 +913,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
      //     qWarning() << get_query.lastError();
      //     qWarning() << FindCatalog(catalog);
  
@@ -62,7 +62,7 @@ index 1718342..a76c208 100644
      {
          qWarning() << get_query.lastQuery();
 diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp
-index a0e2b5d..5f76174 100644
+index 6140a9a..399f2a4 100644
 --- a/kstars/auxiliary/thememanager.cpp
 +++ b/kstars/auxiliary/thememanager.cpp
 @@ -153,9 +153,11 @@ void Manager::slotChangePalette()
@@ -90,7 +90,7 @@ index a0e2b5d..5f76174 100644
      else
          qApp->setStyle(QStyleFactory::create("Fusion"));
  
-@@ -402,6 +408,12 @@ void Manager::setIconTheme(IconTheme theme)
+@@ -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;
      QResource::registerResource(resourcePath, "/icons/" + iconTheme);
@@ -101,8 +101,8 @@ index a0e2b5d..5f76174 100644
 +	QString resourcePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory) + QDir::separator() + iconTheme + QDir::separator() + rccFile;
 +	QResource::registerResource(resourcePath, "/icons/" + iconTheme);
      #else
-     //TODO On Linux on non-KDE Distros, find out if the themes are installed or not and perhaps warn the user
-     #endif
+     // On Linux on non-KDE Distros, find out if the themes are installed or not and perhaps warn the user
+     // The important point is that the current theme must be left as is to avoid empty icons
 diff --git a/kstars/auxiliary/thememanager.h b/kstars/auxiliary/thememanager.h
 index 8eafbfa..09bab99 100644
 --- a/kstars/auxiliary/thememanager.h
@@ -129,18 +129,8 @@ index fa3ae42..660498a 100644
  #define LINKAGE
  #endif
  
--- 
-2.28.0
-
-
-From eb404271b1384678e0e276cdf1894564fe850919 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 22 Aug 2020 21:45:18 +1000
-Subject: Don't set stack size for Haiku
-
-
 diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp
-index 247e448..4747b02 100644
+index 9c5bd5a..861de0c 100644
 --- a/kstars/kstars.cpp
 +++ b/kstars/kstars.cpp
 @@ -71,7 +71,7 @@ KStars::KStars(bool doSplash, bool clockrun, const QString &startdate)