haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

digiKam: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-03-30 19:45:48 +10:00
parent 073263e206
commit 3d62d30d14
2 changed files with 139 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-gfx/digikam/digikam-7.1.0.recipe → media-gfx/digikam/digikam-7.2.0.recipe
View File

@@ -4,11 +4,11 @@ application that runs on Linux, Windows, and MacOS. The application provides \
a comprehensive set of tools for importing, managing, editing, and sharing \
photos and RAW files."
HOMEPAGE="https://digikam.org/"
COPYRIGHT="2010-2020 KDE Organisation"
COPYRIGHT="2010-2021 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="4"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz"
CHECKSUM_SHA256="b103c8463adf04939583199e13f8e83015d8a4a9ad79ebfd502d2a50b5a5abbe"
CHECKSUM_SHA256="cd87ece143aefa02e692a4af5c3c3cc107b9a4d61804d79fa77dd2e344798a17"
SOURCE_DIR="digikam-$portVersion"
PATCHES="digikam-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -107,7 +107,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.65
extra_cmake_modules$secondaryArchSuffix >= 5.80
devel:eigen$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
@@ -214,6 +214,7 @@ BUILD()
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" \
-DENABLE_DBUS=OFF \
-DENABLE_MEDIAPLAYER=ON \
-DENABLE_APPSTYLES=ON \

312
media-gfx/digikam/patches/digikam-7.1.0.patchset → media-gfx/digikam/patches/digikam-7.2.0.patchset
View File

@@ -1,14 +1,14 @@
From d2e4ca47f490bfb49babf427095fec10a6bb2220 Mon Sep 17 00:00:00 2001
From 039f0c5a09a7a0e74f4d865bf9530376fe15f377 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 17 Nov 2020 21:28:37 +1000
Date: Tue, 30 Mar 2021 19:43:06 +1000
Subject: Fix build for Haiku
diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake
index a02d7eb..43ef26e 100644
index c3dd4ef..87aa3d6 100644
--- a/core/app/DigikamTarget.cmake
+++ b/core/app/DigikamTarget.cmake
@@ -49,6 +49,10 @@ target_link_libraries(digikam
@@ -50,6 +50,10 @@ target_link_libraries(digikam
digikamgui
)
@@ -19,8 +19,45 @@ index a02d7eb..43ef26e 100644
if(ENABLE_DBUS)
target_link_libraries(digikam
diff --git a/core/app/main/digikamapp_setup.cpp b/core/app/main/digikamapp_setup.cpp
index 94b436d..1660e08 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
@@ -792,9 +793,9 @@ void DigikamApp::setupActions()
loadCameras();
// Load Themes
-
+#ifndef Q_OS_HAIKU
populateThemes();
-
+#endif
createGUI(xmlFile());
registerPluginsActions();
diff --git a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h
index 81d79d5..0df98a0 100644
--- a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h
+++ b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h
@@ -136,6 +136,11 @@
#define NPT_CONFIG_HAVE_GETADDRINFO
#endif
+/* Haiku */
+#if defined(__HAIKU__)
+#define NPT_CONFIG_HAVE_GETADDRINFO
+#endif
+
/* linux */
#if defined(__linux__)
#define NPT_CONFIG_HAVE_GETADDRINFO
diff --git a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
index 4b79915..4e1336c 100644
index 6208185..1f5e213 100644
--- a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
+++ b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
@@ -13,6 +13,9 @@
@@ -34,7 +71,7 @@ index 4b79915..4e1336c 100644
#include <sys/ioctl.h>
#include <netinet/in.h>
diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
index e8b2e1b..ea823d6 100644
index ee6ccd5..9cce4b7 100644
--- a/core/libs/dimg/filters/curves/curveswidget.cpp
+++ b/core/libs/dimg/filters/curves/curveswidget.cpp
@@ -32,6 +32,7 @@
@@ -91,103 +128,37 @@ index 791343a..76a8dba 100644
#ifndef __POSIX__
#define __POSIX__
#endif
diff --git a/core/libs/threadimageio/thumb/thumbnailbasic.cpp b/core/libs/threadimageio/thumb/thumbnailbasic.cpp
index 48621ac..b6ddaaf 100644
--- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp
+++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp
diff --git a/core/libs/settings/applicationsettings_miscs.cpp b/core/libs/settings/applicationsettings_miscs.cpp
index 8b56470..9198ea3 100644
--- a/core/libs/settings/applicationsettings_miscs.cpp
+++ b/core/libs/settings/applicationsettings_miscs.cpp
@@ -484,7 +484,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
QFont ApplicationSettings::getApplicationFont() const
{
+#ifdef Q_OS_HAIKU
+ return QFontDatabase::systemFont(QFontDatabase::GeneralFont);
+#else
return d->applicationFont;
+#endif
}
bool ApplicationSettings::getHelpBoxNotificationSeen() {
diff --git a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
index 3b69700..56174cc 100644
--- a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
+++ b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
@@ -47,7 +47,7 @@ extern "C"
#include <sys/stat.h>
#include <sys/types.h>
-#ifndef Q_OS_WIN32
+#if !defined(_WIN32) && !defined(__HAIKU__)
+#if !defined(Q_OS_WIN32) && !defined(Q_OS_HAIKU)
# include <sys/ipc.h>
# include <sys/shm.h>
#endif
diff --git a/core/tests/video/qtavcodecs.cpp b/core/tests/video/qtavcodecs.cpp
index ac98478..72bf95b 100644
--- a/core/tests/video/qtavcodecs.cpp
+++ b/core/tests/video/qtavcodecs.cpp
@@ -22,6 +22,7 @@
* ============================================================ */
#include <QDebug>
+#include <QPainterPath>
// QtAv includes
diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp
index 874e7bb..cff1f55 100644
--- a/core/utilities/import/backend/gpcamera.cpp
+++ b/core/utilities/import/backend/gpcamera.cpp
@@ -66,6 +66,10 @@ extern "C"
//#define GPHOTO2_DEBUG 1
+#ifdef Q_OS_HAIKU
+#define HAVE_GPHOTO25 1
+#endif
+
#ifdef HAVE_GPHOTO2
// LibGphoto2 includes
--
2.30.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.30.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
index 8283afd..fb6d7ff 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)
@@ -198,15 +169,15 @@ index 913e0aa..334cf2b 100644
updateCurrentDesktopDefaultThemePreview();
QString theme(currentThemeName());
@@ -137,6 +138,7 @@ void ThemeManager::slotChangePalette()
qCDebug(DIGIKAM_WIDGETS_LOG) << theme << " :: " << filename;
@@ -139,6 +140,7 @@ void ThemeManager::slotChangePalette()
qCDebug(DIGIKAM_WIDGETS_LOG) << theme << " :: " << filePath;
emit signalThemeChanged();
+#endif
}
void ThemeManager::setThemeMenuAction(QMenu* const action)
@@ -163,6 +165,7 @@ void ThemeManager::registerThemeActions(DXmlGuiWindow* const win)
@@ -165,6 +167,7 @@ void ThemeManager::registerThemeActions(DXmlGuiWindow* const win)
void ThemeManager::populateThemeMenu()
{
@@ -214,7 +185,7 @@ index 913e0aa..334cf2b 100644
if (!d->themeMenuAction)
{
return;
@@ -232,6 +235,7 @@ void ThemeManager::populateThemeMenu()
@@ -227,6 +230,7 @@ void ThemeManager::populateThemeMenu()
updateCurrentDesktopDefaultThemePreview();
setCurrentTheme(theme);
@@ -223,7 +194,7 @@ index 913e0aa..334cf2b 100644
void ThemeManager::updateCurrentDesktopDefaultThemePreview()
diff --git a/core/showfoto/main/showfoto_setup.cpp b/core/showfoto/main/showfoto_setup.cpp
index 6402347..19ba011 100644
index 4fd6b85..4d42c64 100644
--- a/core/showfoto/main/showfoto_setup.cpp
+++ b/core/showfoto/main/showfoto_setup.cpp
@@ -28,7 +28,9 @@ namespace ShowFoto
@@ -236,37 +207,11 @@ index 6402347..19ba011 100644
setupStandardActions();
// Extra 'File' menu actions ---------------------------------------------
--
2.30.0
From 4b059162627b85be26073f0dbe539db7260ff183 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 10 Jan 2021 20:23:37 +1000
Subject: Remove custom application font
diff --git a/core/libs/settings/applicationsettings_miscs.cpp b/core/libs/settings/applicationsettings_miscs.cpp
index 62a9d43..b664143 100644
--- a/core/libs/settings/applicationsettings_miscs.cpp
+++ b/core/libs/settings/applicationsettings_miscs.cpp
@@ -444,7 +444,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
QFont ApplicationSettings::getApplicationFont() const
{
+#ifdef Q_OS_HAIKU
+ return QFontDatabase::systemFont(QFontDatabase::GeneralFont);
+#else
return d->applicationFont;
+#endif
}
} // namespace Digikam
diff --git a/core/showfoto/main/showfotosettings.cpp b/core/showfoto/main/showfotosettings.cpp
index 0e8a63f..c064205 100644
index af093f4..45b8de3 100644
--- a/core/showfoto/main/showfotosettings.cpp
+++ b/core/showfoto/main/showfotosettings.cpp
@@ -361,7 +361,11 @@ QString ShowfotoSettings::getIconTheme() const
@@ -397,7 +397,11 @@ QString ShowfotoSettings::getIconTheme() const
QFont ShowfotoSettings::getApplicationFont() const
{
@@ -278,11 +223,35 @@ index 0e8a63f..c064205 100644
}
bool ShowfotoSettings::getShowSplash() const
diff --git a/core/showfoto/setup/showfotosetup.cpp b/core/showfoto/setup/showfotosetup.cpp
index b4cfca3..216be24 100644
--- a/core/showfoto/setup/showfotosetup.cpp
+++ b/core/showfoto/setup/showfotosetup.cpp
@@ -196,7 +196,9 @@ Setup::Setup(QWidget* const parent, Setup::Page page)
winId();
Digikam::DXmlGuiWindow::restoreWindowSize(windowHandle(), group);
+#ifndef Q_OS_HAIKU
resize(windowHandle()->size());
+#endif
}
Setup::~Setup()
diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp
index 574b290..05b4260 100644
index 957995b..c91c772 100644
--- a/core/showfoto/setup/showfotosetupmisc.cpp
+++ b/core/showfoto/setup/showfotosetupmisc.cpp
@@ -99,7 +99,9 @@ public:
@@ -83,7 +83,9 @@ public:
sortOrderComboBox (nullptr),
applicationStyle (nullptr),
applicationIcon (nullptr),
+#ifndef Q_OS_HAIKU
applicationFont (nullptr),
+#endif
systemSettingsWidget (nullptr),
settings (ShowfotoSettings::instance())
{
@@ -110,7 +112,9 @@ public:
QComboBox* sortOrderComboBox;
QComboBox* applicationStyle;
QComboBox* applicationIcon;
@@ -292,7 +261,7 @@ index 574b290..05b4260 100644
SystemSettingsWidget* systemSettingsWidget;
@@ -250,10 +252,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
@@ -300,10 +304,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
{
d->applicationIcon->addItem(it.key(), it.value());
}
@@ -305,7 +274,7 @@ index 574b290..05b4260 100644
// --------------------------------------------------------
layout2->setContentsMargins(spacing, spacing, spacing, spacing);
@@ -263,7 +265,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
@@ -313,7 +317,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
layout2->addWidget(tabStyleHbox);
layout2->addWidget(appStyleHbox);
layout2->addWidget(iconThemeHbox);
@@ -315,7 +284,7 @@ index 574b290..05b4260 100644
layout2->addStretch();
d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
@@ -304,7 +308,9 @@ void SetupMisc::readSettings()
@@ -383,7 +389,9 @@ void SetupMisc::readSettings()
#endif
d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(d->settings->getIconTheme()));
@@ -325,7 +294,7 @@ index 574b290..05b4260 100644
}
void SetupMisc::applySettings()
@@ -327,7 +333,9 @@ void SetupMisc::applySettings()
@@ -408,7 +416,9 @@ void SetupMisc::applySettings()
#endif
d->settings->setIconTheme(d->applicationIcon->currentData().toString());
@@ -335,11 +304,36 @@ index 574b290..05b4260 100644
d->settings->syncConfig();
}
diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp
index 368dd07..4dacb1b 100644
--- a/core/utilities/import/backend/gpcamera.cpp
+++ b/core/utilities/import/backend/gpcamera.cpp
@@ -67,6 +67,10 @@ extern "C"
//#define GPHOTO2_DEBUG 1
+#ifdef Q_OS_HAIKU
+#define HAVE_GPHOTO25 1
+#endif
+
#ifdef HAVE_GPHOTO2
// LibGphoto2 includes
diff --git a/core/utilities/setup/setupmisc.cpp b/core/utilities/setup/setupmisc.cpp
index 9c2ea58..ef658fb 100644
index 83cddca..600955f 100644
--- a/core/utilities/setup/setupmisc.cpp
+++ b/core/utilities/setup/setupmisc.cpp
@@ -113,8 +113,9 @@ public:
@@ -92,7 +92,9 @@ public:
stringComparisonType (nullptr),
applicationStyle (nullptr),
applicationIcon (nullptr),
+#ifndef Q_OS_HAIKU
applicationFont (nullptr),
+#endif
minimumSimilarityBound (nullptr),
systemSettingsWidget (nullptr),
groupingButtons (QHash<int, QButtonGroup*>())
@@ -127,8 +129,9 @@ public:
QComboBox* stringComparisonType;
QComboBox* applicationStyle;
QComboBox* applicationIcon;
@@ -350,7 +344,7 @@ index 9c2ea58..ef658fb 100644
QSpinBox* minimumSimilarityBound;
SystemSettingsWidget* systemSettingsWidget;
@@ -290,9 +291,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
@@ -352,9 +355,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
d->applicationIcon->addItem(it.key(), it.value());
}
@@ -362,7 +356,7 @@ index 9c2ea58..ef658fb 100644
// --------------------------------------------------------
layout2->setContentsMargins(spacing, spacing, spacing, spacing);
@@ -303,7 +305,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
@@ -365,7 +369,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
layout2->addWidget(tabStyleHbox);
layout2->addWidget(appStyleHbox);
layout2->addWidget(iconThemeHbox);
@@ -372,7 +366,7 @@ index 9c2ea58..ef658fb 100644
layout2->addStretch();
d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
@@ -422,7 +426,9 @@ void SetupMisc::applySettings()
@@ -518,7 +524,9 @@ void SetupMisc::applySettings()
#endif
settings->setIconTheme(d->applicationIcon->currentData().toString());
@@ -382,7 +376,7 @@ index 9c2ea58..ef658fb 100644
settings->saveSettings();
}
@@ -459,7 +465,9 @@ void SetupMisc::readSettings()
@@ -558,7 +566,9 @@ void SetupMisc::readSettings()
#endif
d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(settings->getIconTheme()));
@@ -393,43 +387,5 @@ index 9c2ea58..ef658fb 100644
} // namespace Digikam
--
2.30.0
From 6c8263cc21ef134aa0d5cf467650389b11bff39d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 10 Jan 2021 23:37:50 +1000
Subject: Remove applicationFont initialization
diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp
index 05b4260..515d573 100644
--- a/core/showfoto/setup/showfotosetupmisc.cpp
+++ b/core/showfoto/setup/showfotosetupmisc.cpp
@@ -76,7 +76,9 @@ public:
sortOrderComboBox(nullptr),
applicationStyle(nullptr),
applicationIcon(nullptr),
+#ifndef Q_OS_HAIKU
applicationFont(nullptr),
+#endif
systemSettingsWidget(nullptr),
settings(ShowfotoSettings::instance())
{
diff --git a/core/utilities/setup/setupmisc.cpp b/core/utilities/setup/setupmisc.cpp
index ef658fb..baea842 100644
--- a/core/utilities/setup/setupmisc.cpp
+++ b/core/utilities/setup/setupmisc.cpp
@@ -83,7 +83,9 @@ public:
stringComparisonType(nullptr),
applicationStyle(nullptr),
applicationIcon(nullptr),
+#ifndef Q_OS_HAIKU
applicationFont(nullptr),
+#endif
minimumSimilarityBound(nullptr),
systemSettingsWidget(nullptr),
groupingButtons(QHash<int, QButtonGroup*>())
--
2.30.0
2.30.2