From 5c1bd67fc3cd332fbffcec20e43a7d13ac631664 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 28 Jul 2018 14:43:22 +1000
Subject: [PATCH] KStars: bump version

---
 ...stars-2.9.5.recipe => kstars-2.9.7.recipe} |  4 +--
 ...s-2.9.5.patchset => kstars-2.9.7.patchset} | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename kde-base/kstars/{kstars-2.9.5.recipe => kstars-2.9.7.recipe} (98%)
 rename kde-base/kstars/patches/{kstars-2.9.5.patchset => kstars-2.9.7.patchset} (91%)

diff --git a/kde-base/kstars/kstars-2.9.5.recipe b/kde-base/kstars/kstars-2.9.7.recipe
similarity index 98%
rename from kde-base/kstars/kstars-2.9.5.recipe
rename to kde-base/kstars/kstars-2.9.7.recipe
index e76fcbf98..2b8079e93 100644
--- a/kde-base/kstars/kstars-2.9.5.recipe
+++ b/kde-base/kstars/kstars-2.9.7.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="2010-2018 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/KDE/kstars/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1885ded911bfd3c56df3d551b903b7d1435a4760be5fceee0eefbf9405330f59"
+CHECKSUM_SHA256="841c528bde93c6131f7e83c778ed27e22358ca8d84b134bfeff2752be159b311"
 PATCHES="kstars-$portVersion.patchset"
 ADDITIONAL_FILES="kstars.rdef.in"
 
@@ -75,7 +75,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
+	extra_cmake_modules >= 5.47
 	haiku${secondaryArchSuffix}_devel
 	devel:eigen$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
diff --git a/kde-base/kstars/patches/kstars-2.9.5.patchset b/kde-base/kstars/patches/kstars-2.9.7.patchset
similarity index 91%
rename from kde-base/kstars/patches/kstars-2.9.5.patchset
rename to kde-base/kstars/patches/kstars-2.9.7.patchset
index 40e91dfdd..e14f1b4c9 100644
--- a/kde-base/kstars/patches/kstars-2.9.5.patchset
+++ b/kde-base/kstars/patches/kstars-2.9.7.patchset
@@ -5,11 +5,11 @@ Subject: Fix build for Haiku
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 096c597..019caee 100644
+index 69f2409..82426c1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -247,6 +247,19 @@ if (UNIX)
- endif(UNIX)
+@@ -272,6 +272,19 @@ if (ANDROID)
+ endif ()
  
  # Add security (hardening flags)
 +IF (HAIKU)
@@ -28,7 +28,7 @@ index 096c597..019caee 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)
-@@ -264,6 +277,7 @@ IF (UNIX OR APPLE OR ANDROID)
+@@ -289,6 +302,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 096c597..019caee 100644
  
  # Clang Format support
  IF (UNIX OR APPLE)
-@@ -374,7 +388,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kstars/version.h.cmake
+@@ -399,7 +413,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kstars/version.h.cmake
  # let our config.h be found first in any case
  include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR})
  
@@ -83,10 +83,10 @@ Subject: Native Haiku style for Default theme
 
 
 diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp
-index 4520c6b..9a2b788 100644
+index 963309a..70bc9bb 100644
 --- a/kstars/auxiliary/thememanager.cpp
 +++ b/kstars/auxiliary/thememanager.cpp
-@@ -158,9 +158,11 @@ void Manager::slotChangePalette()
+@@ -153,9 +153,11 @@ void Manager::slotChangePalette()
  
      if (theme == "Macintosh" || theme == "White Balance" || theme == "High Key" || (theme == "Default" && currentDesktopdefaultTheme().contains("Dark") == false))
          themeIconType = BREEZE_THEME;
@@ -100,7 +100,7 @@ index 4520c6b..9a2b788 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
-@@ -182,6 +184,10 @@ void Manager::slotChangePalette()
+@@ -177,6 +179,10 @@ void Manager::slotChangePalette()
  
      if(theme == "Macintosh")
          qApp->setStyle(QStyleFactory::create("macintosh"));
@@ -111,7 +111,7 @@ index 4520c6b..9a2b788 100644
      else
          qApp->setStyle(QStyleFactory::create("Fusion"));
  
-@@ -407,6 +413,12 @@ void Manager::setIconTheme(IconTheme theme)
+@@ -402,6 +408,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);
@@ -125,10 +125,10 @@ index 4520c6b..9a2b788 100644
      //TODO On Linux on non-KDE Distros, find out if the themes are installed or not and perhaps warn the user
      #endif
 diff --git a/kstars/auxiliary/thememanager.h b/kstars/auxiliary/thememanager.h
-index 0b08063..57904c1 100644
+index 0b6fb32..070fd04 100644
 --- a/kstars/auxiliary/thememanager.h
 +++ b/kstars/auxiliary/thememanager.h
-@@ -48,7 +48,7 @@ class Manager : public QObject
+@@ -42,7 +42,7 @@ class Manager : public QObject
  
  public:
  
@@ -148,10 +148,10 @@ Subject: Fix strange bug in Haiku x64
 
 
 diff --git a/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp
-index 81c09cc..18bf328 100644
+index 3ab805f..5795537 100644
 --- a/datahandlers/catalogdb.cpp
 +++ b/datahandlers/catalogdb.cpp
-@@ -848,6 +848,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
+@@ -870,6 +870,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
      //     qWarning() << get_query.lastError();
      //     qWarning() << FindCatalog(catalog);