diff --git a/media-gfx/digikam/digikam-7.2.0.recipe b/media-gfx/digikam/digikam-7.6.0.recipe similarity index 95% rename from media-gfx/digikam/digikam-7.2.0.recipe rename to media-gfx/digikam/digikam-7.6.0.recipe index 2c8ae4966..c3aface2b 100644 --- a/media-gfx/digikam/digikam-7.2.0.recipe +++ b/media-gfx/digikam/digikam-7.6.0.recipe @@ -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-2021 KDE Organisation" +COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" -SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz" -CHECKSUM_SHA256="cd87ece143aefa02e692a4af5c3c3cc107b9a4d61804d79fa77dd2e344798a17" +SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digiKam-$portVersion.tar.xz" +CHECKSUM_SHA256="d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641" SOURCE_DIR="digikam-$portVersion" PATCHES="digikam-$portVersion.patchset" ADDITIONAL_FILES=" @@ -35,6 +35,8 @@ REQUIRES=" lib:libavutil$secondaryArchSuffix lib:libexiv2$secondaryArchSuffix lib:libexpat$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libGLU$secondaryArchSuffix lib:libglib_2.0${secondaryArchSuffix} lib:libgomp$secondaryArchSuffix lib:libgphoto2$secondaryArchSuffix @@ -107,8 +109,10 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.80 + extra_cmake_modules$secondaryArchSuffix >= 5.93 devel:eigen$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libGLU$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix @@ -168,7 +172,7 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:libqtav$secondaryArchSuffix devel:libqtavwidgets$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix >= 5.15 + devel:libQt5Core$secondaryArchSuffix devel:libQt5WebKitWidgets$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libxml2$secondaryArchSuffix @@ -192,10 +196,10 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:flex cmd:g++$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:qdbuscpp2xml$secondaryArchSuffix + cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " BUILD() diff --git a/media-gfx/digikam/patches/digikam-7.2.0.patchset b/media-gfx/digikam/patches/digikam-7.6.0.patchset similarity index 87% rename from media-gfx/digikam/patches/digikam-7.2.0.patchset rename to media-gfx/digikam/patches/digikam-7.6.0.patchset index 1bd9ef8d3..6c68b0edd 100644 --- a/media-gfx/digikam/patches/digikam-7.2.0.patchset +++ b/media-gfx/digikam/patches/digikam-7.6.0.patchset @@ -1,14 +1,14 @@ -From 039f0c5a09a7a0e74f4d865bf9530376fe15f377 Mon Sep 17 00:00:00 2001 +From ae5b06f79b4a18afebed0c6d50c57a857475b947 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 30 Mar 2021 19:43:06 +1000 +Date: Thu, 12 May 2022 13:47:35 +1000 Subject: Fix build for Haiku diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake -index c3dd4ef..87aa3d6 100644 +index 1ba46f2..b73f998 100644 --- a/core/app/DigikamTarget.cmake +++ b/core/app/DigikamTarget.cmake -@@ -50,6 +50,10 @@ target_link_libraries(digikam +@@ -66,6 +66,10 @@ target_link_libraries(digikam digikamgui ) @@ -20,7 +20,7 @@ index c3dd4ef..87aa3d6 100644 target_link_libraries(digikam diff --git a/core/app/main/digikamapp_setup.cpp b/core/app/main/digikamapp_setup.cpp -index 94b436d..1660e08 100644 +index 179efd9..05940c8 100644 --- a/core/app/main/digikamapp_setup.cpp +++ b/core/app/main/digikamapp_setup.cpp @@ -1,3 +1,4 @@ @@ -28,7 +28,7 @@ index 94b436d..1660e08 100644 /* ============================================================ * * This file is a part of digiKam project -@@ -792,9 +793,9 @@ void DigikamApp::setupActions() +@@ -801,9 +802,9 @@ void DigikamApp::setupActions() loadCameras(); // Load Themes @@ -41,7 +41,7 @@ index 94b436d..1660e08 100644 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 +index f067389..b541bc4 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 @@ @@ -57,7 +57,7 @@ index 81d79d5..0df98a0 100644 #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 6208185..1f5e213 100644 +index 5f20d6c..990927f 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 @@ @@ -71,7 +71,7 @@ index 6208185..1f5e213 100644 #include #include diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp -index ee6ccd5..9cce4b7 100644 +index 96ab291..b8cf522 100644 --- a/core/libs/dimg/filters/curves/curveswidget.cpp +++ b/core/libs/dimg/filters/curves/curveswidget.cpp @@ -32,6 +32,7 @@ @@ -83,21 +83,20 @@ index ee6ccd5..9cce4b7 100644 #include #include diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_types.h b/core/libs/dngwriter/extra/dng_sdk/dng_types.h -index c8915d9..11d3996 100644 +index 91a45cf..1e92b08 100644 --- a/core/libs/dngwriter/extra/dng_sdk/dng_types.h +++ b/core/libs/dngwriter/extra/dng_sdk/dng_types.h -@@ -33,7 +33,9 @@ - /*****************************************************************************/ +@@ -27,6 +27,9 @@ + + #if qDNGUseStdInt || 1 - #ifdef qDNGUseStdInt -- +#ifdef __HAIKU__ +#include +#else typedef int8_t int8; typedef int16_t int16; typedef int32_t int32; -@@ -43,7 +45,7 @@ typedef uint8_t uint8; +@@ -36,7 +39,7 @@ typedef uint8_t uint8; typedef uint16_t uint16; typedef uint32_t uint32; typedef uint64_t uint64; @@ -107,7 +106,7 @@ index c8915d9..11d3996 100644 typedef signed char int8; diff --git a/core/libs/pgfutils/libpgf/PGFplatform.h b/core/libs/pgfutils/libpgf/PGFplatform.h -index 791343a..76a8dba 100644 +index ac0708e..3ee990b 100644 --- a/core/libs/pgfutils/libpgf/PGFplatform.h +++ b/core/libs/pgfutils/libpgf/PGFplatform.h @@ -320,7 +320,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) { @@ -125,14 +124,14 @@ index 791343a..76a8dba 100644 //------------------------------------------------------------------------------- -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__HAIKU__) - #ifndef __POSIX__ - #define __POSIX__ - #endif + #ifndef __POSIX__ + #define __POSIX__ + #endif diff --git a/core/libs/settings/applicationsettings_miscs.cpp b/core/libs/settings/applicationsettings_miscs.cpp -index 8b56470..9198ea3 100644 +index ad40d4a..0a77a1c 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) +@@ -494,7 +494,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font) QFont ApplicationSettings::getApplicationFont() const { @@ -145,7 +144,7 @@ index 8b56470..9198ea3 100644 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 +index e6c2c7a..9c429ff 100644 --- a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp +++ b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp @@ -47,7 +47,7 @@ extern "C" @@ -158,7 +157,7 @@ index 3b69700..56174cc 100644 # include #endif diff --git a/core/libs/widgets/mainview/thememanager.cpp b/core/libs/widgets/mainview/thememanager.cpp -index 8283afd..fb6d7ff 100644 +index d036136..9975eb0 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) @@ -194,12 +193,12 @@ index 8283afd..fb6d7ff 100644 void ThemeManager::updateCurrentDesktopDefaultThemePreview() diff --git a/core/showfoto/main/showfoto_setup.cpp b/core/showfoto/main/showfoto_setup.cpp -index 4fd6b85..4d42c64 100644 +index c233de4..9b69828 100644 --- a/core/showfoto/main/showfoto_setup.cpp +++ b/core/showfoto/main/showfoto_setup.cpp @@ -28,7 +28,9 @@ namespace ShowFoto - void ShowFoto::setupActions() + void Showfoto::setupActions() { +#ifndef Q_OS_HAIKU Digikam::ThemeManager::instance()->setThemeMenuAction(new QMenu(i18n("&Themes"), this)); @@ -208,10 +207,10 @@ index 4fd6b85..4d42c64 100644 // Extra 'File' menu actions --------------------------------------------- diff --git a/core/showfoto/main/showfotosettings.cpp b/core/showfoto/main/showfotosettings.cpp -index af093f4..45b8de3 100644 +index 1ccb923..3c2ed5d 100644 --- a/core/showfoto/main/showfotosettings.cpp +++ b/core/showfoto/main/showfotosettings.cpp -@@ -397,7 +397,11 @@ QString ShowfotoSettings::getIconTheme() const +@@ -398,7 +398,11 @@ QString ShowfotoSettings::getIconTheme() const QFont ShowfotoSettings::getApplicationFont() const { @@ -224,10 +223,10 @@ index af093f4..45b8de3 100644 bool ShowfotoSettings::getShowSplash() const diff --git a/core/showfoto/setup/showfotosetup.cpp b/core/showfoto/setup/showfotosetup.cpp -index b4cfca3..216be24 100644 +index 2152f5a..3574688 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) +@@ -196,7 +196,9 @@ ShowfotoSetup::ShowfotoSetup(QWidget* const parent, ShowfotoSetup::Page page) winId(); Digikam::DXmlGuiWindow::restoreWindowSize(windowHandle(), group); @@ -236,9 +235,9 @@ index b4cfca3..216be24 100644 +#endif } - Setup::~Setup() + ShowfotoSetup::~ShowfotoSetup() diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp -index 957995b..c91c772 100644 +index 573d574..4282844 100644 --- a/core/showfoto/setup/showfotosetupmisc.cpp +++ b/core/showfoto/setup/showfotosetupmisc.cpp @@ -83,7 +83,9 @@ public: @@ -261,7 +260,7 @@ index 957995b..c91c772 100644 SystemSettingsWidget* systemSettingsWidget; -@@ -300,10 +304,10 @@ SetupMisc::SetupMisc(QWidget* const parent) +@@ -301,10 +305,10 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent) { d->applicationIcon->addItem(it.key(), it.value()); } @@ -274,7 +273,7 @@ index 957995b..c91c772 100644 // -------------------------------------------------------- layout2->setContentsMargins(spacing, spacing, spacing, spacing); -@@ -313,7 +317,9 @@ SetupMisc::SetupMisc(QWidget* const parent) +@@ -314,7 +318,9 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent) layout2->addWidget(tabStyleHbox); layout2->addWidget(appStyleHbox); layout2->addWidget(iconThemeHbox); @@ -284,7 +283,7 @@ index 957995b..c91c772 100644 layout2->addStretch(); d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance")); -@@ -383,7 +389,9 @@ void SetupMisc::readSettings() +@@ -384,7 +390,9 @@ void ShowfotoSetupMisc::readSettings() #endif d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(d->settings->getIconTheme())); @@ -293,8 +292,8 @@ index 957995b..c91c772 100644 +#endif } - void SetupMisc::applySettings() -@@ -408,7 +416,9 @@ void SetupMisc::applySettings() + void ShowfotoSetupMisc::applySettings() +@@ -409,7 +417,9 @@ void ShowfotoSetupMisc::applySettings() #endif d->settings->setIconTheme(d->applicationIcon->currentData().toString()); @@ -305,7 +304,7 @@ index 957995b..c91c772 100644 } diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp -index 368dd07..4dacb1b 100644 +index 696c6eb..cee40fa 100644 --- a/core/utilities/import/backend/gpcamera.cpp +++ b/core/utilities/import/backend/gpcamera.cpp @@ -67,6 +67,10 @@ extern "C" @@ -320,10 +319,10 @@ index 368dd07..4dacb1b 100644 // LibGphoto2 includes diff --git a/core/utilities/setup/setupmisc.cpp b/core/utilities/setup/setupmisc.cpp -index 83cddca..600955f 100644 +index 8986c23..4949d7b 100644 --- a/core/utilities/setup/setupmisc.cpp +++ b/core/utilities/setup/setupmisc.cpp -@@ -92,7 +92,9 @@ public: +@@ -96,7 +96,9 @@ public: stringComparisonType (nullptr), applicationStyle (nullptr), applicationIcon (nullptr), @@ -333,7 +332,7 @@ index 83cddca..600955f 100644 minimumSimilarityBound (nullptr), systemSettingsWidget (nullptr), groupingButtons (QHash()) -@@ -127,8 +129,9 @@ public: +@@ -133,8 +135,9 @@ public: QComboBox* stringComparisonType; QComboBox* applicationStyle; QComboBox* applicationIcon; @@ -344,7 +343,7 @@ index 83cddca..600955f 100644 QSpinBox* minimumSimilarityBound; SystemSettingsWidget* systemSettingsWidget; -@@ -352,9 +355,10 @@ SetupMisc::SetupMisc(QWidget* const parent) +@@ -378,9 +381,10 @@ SetupMisc::SetupMisc(QWidget* const parent) d->applicationIcon->addItem(it.key(), it.value()); } @@ -356,7 +355,7 @@ index 83cddca..600955f 100644 // -------------------------------------------------------- layout2->setContentsMargins(spacing, spacing, spacing, spacing); -@@ -365,7 +369,9 @@ SetupMisc::SetupMisc(QWidget* const parent) +@@ -391,7 +395,9 @@ SetupMisc::SetupMisc(QWidget* const parent) layout2->addWidget(tabStyleHbox); layout2->addWidget(appStyleHbox); layout2->addWidget(iconThemeHbox); @@ -366,7 +365,7 @@ index 83cddca..600955f 100644 layout2->addStretch(); d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance")); -@@ -518,7 +524,9 @@ void SetupMisc::applySettings() +@@ -549,7 +555,9 @@ void SetupMisc::applySettings() #endif settings->setIconTheme(d->applicationIcon->currentData().toString()); @@ -376,7 +375,7 @@ index 83cddca..600955f 100644 settings->saveSettings(); } -@@ -558,7 +566,9 @@ void SetupMisc::readSettings() +@@ -593,7 +601,9 @@ void SetupMisc::readSettings() #endif d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(settings->getIconTheme()));