DigiKam: fix crash, use system colors for ui

media-gfx/digikam/digikam-7.1.0.recipe

@@ -6,7 +6,7 @@ photos and RAW files."
 HOMEPAGE="https://digikam.org/"
 COPYRIGHT="2010-2020 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz"
 CHECKSUM_SHA256="b103c8463adf04939583199e13f8e83015d8a4a9ad79ebfd502d2a50b5a5abbe"
 SOURCE_DIR="digikam-$portVersion"

media-gfx/digikam/patches/digikam-7.1.0.patchset

@@ -1,4 +1,4 @@
-From 4a9539d3972626948cc232bf602ead6141a984f5 Mon Sep 17 00:00:00 2001
+From d2e4ca47f490bfb49babf427095fec10a6bb2220 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 17 Nov 2020 21:28:37 +1000
 Subject: Fix build for Haiku
@@ -134,3 +134,108 @@ index 874e7bb..cff1f55 100644
 -- 
 2.28.0
 
+
+From c4c43c12be843605695df92157c76c1b1838df20 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 31 Dec 2020 19:22:03 +1000
+Subject: Fix crash
+
+
+diff --git a/core/showfoto/setup/showfotosetup.cpp b/core/showfoto/setup/showfotosetup.cpp
+index 76bb183..47fa056 100644
+--- a/core/showfoto/setup/showfotosetup.cpp
++++ b/core/showfoto/setup/showfotosetup.cpp
+@@ -192,7 +192,9 @@ Setup::Setup(QWidget* const parent, Setup::Page page)
+     }
+ 
+     Digikam::DXmlGuiWindow::restoreWindowSize(windowHandle(), group);
++#ifndef Q_OS_HAIKU
+     resize(windowHandle()->size());
++#endif
+ }
+ 
+ Setup::~Setup()
+-- 
+2.28.0
+
+
+From d4304e9dc5e65f5e7a9604acc211a18a018499ee Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 31 Dec 2020 19:22:52 +1000
+Subject: Use system ui colors
+
+
+diff --git a/core/app/main/digikamapp_setup.cpp b/core/app/main/digikamapp_setup.cpp
+index f95fe5b..c614d4a 100644
+--- a/core/app/main/digikamapp_setup.cpp
++++ b/core/app/main/digikamapp_setup.cpp
+@@ -1,3 +1,4 @@
++
+ /* ============================================================
+  *
+  * This file is a part of digiKam project
+@@ -777,9 +778,9 @@ void DigikamApp::setupActions()
+     loadCameras();
+ 
+     // Load Themes
+-
++#ifndef Q_OS_HAIKU
+     populateThemes();
+-
++#endif
+     createGUI(xmlFile());
+ 
+     registerPluginsActions();
+diff --git a/core/libs/widgets/mainview/thememanager.cpp b/core/libs/widgets/mainview/thememanager.cpp
+index 913e0aa..334cf2b 100644
+--- a/core/libs/widgets/mainview/thememanager.cpp
++++ b/core/libs/widgets/mainview/thememanager.cpp
+@@ -116,6 +116,7 @@ void ThemeManager::setCurrentTheme(const QString& name)
+ 
+ void ThemeManager::slotChangePalette()
+ {
++#ifndef Q_OS_HAIKU
+     updateCurrentDesktopDefaultThemePreview();
+ 
+     QString theme(currentThemeName());
+@@ -137,6 +138,7 @@ void ThemeManager::slotChangePalette()
+     qCDebug(DIGIKAM_WIDGETS_LOG) << theme << " :: " << filename;
+ 
+     emit signalThemeChanged();
++#endif
+ }
+ 
+ void ThemeManager::setThemeMenuAction(QMenu* const action)
+@@ -163,6 +165,7 @@ void ThemeManager::registerThemeActions(DXmlGuiWindow* const win)
+ 
+ void ThemeManager::populateThemeMenu()
+ {
++#ifndef Q_OS_HAIKU
+     if (!d->themeMenuAction)
+     {
+         return;
+@@ -232,6 +235,7 @@ void ThemeManager::populateThemeMenu()
+ 
+     updateCurrentDesktopDefaultThemePreview();
+     setCurrentTheme(theme);
++#endif
+ }
+ 
+ void ThemeManager::updateCurrentDesktopDefaultThemePreview()
+diff --git a/core/showfoto/main/showfoto_setup.cpp b/core/showfoto/main/showfoto_setup.cpp
+index 6402347..19ba011 100644
+--- a/core/showfoto/main/showfoto_setup.cpp
++++ b/core/showfoto/main/showfoto_setup.cpp
+@@ -28,7 +28,9 @@ namespace ShowFoto
+ 
+ void ShowFoto::setupActions()
+ {
++#ifndef Q_OS_HAIKU
+     Digikam::ThemeManager::instance()->setThemeMenuAction(new QMenu(i18n("&Themes"), this));
++#endif
+     setupStandardActions();
+ 
+     // Extra 'File' menu actions ---------------------------------------------
+-- 
+2.28.0
+