digikam, bump to version 9.0.0 (#13802)

media-gfx/digikam/digikam-9.0.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-2025 KDE Organisation"
+COPYRIGHT="2010-2026 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digiKam-$portVersion.tar.xz"
-CHECKSUM_SHA256="db3a1b6e3c73f903e3dff8003f52455dd2ecd198cb66534fee4abbd0bdeb6b9a"
+CHECKSUM_SHA256="7680ea024fe00e10c96090e45fe4b7b4a1c3993bc5e87576eddd4e0eefd08ef3"
 SOURCE_DIR="digikam-$portVersion"
 PATCHES="digikam-$portVersion.patchset"
 ADDITIONAL_FILES="
@@ -19,13 +19,16 @@ ADDITIONAL_FILES="
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	digikam$secondaryArchSuffix = $portVersion
 	app:digiKam = $portVersion
 	app:showFoto = $portVersion
-	lib:libdigikamcore$secondaryArchSuffix = $portVersion
-	lib:libdigikamdatabase$secondaryArchSuffix = $portVersion
-	lib:libdigikamgui$secondaryArchSuffix = $portVersion
+	lib:libdigikamcore$secondaryArchSuffix = $libVersionCompat
+	lib:libdigikamdatabase$secondaryArchSuffix = $libVersionCompat
+	lib:libdigikamgui$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -109,14 +112,25 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	digikam${secondaryArchSuffix}_devel = $portVersion compat >= 9
+	devel:libdigikamcore$secondaryArchSuffix = $libVersionCompat
+	devel:libdigikamdatabase$secondaryArchSuffix = $libVersionCompat
+	devel:libdigikamgui$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	haiku$secondaryArchSuffix
+	digikam$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	extra_cmake_modules$secondaryArchSuffix
-	ffmpeg6${secondaryArchSuffix}_devel
+	ffmpeg7${secondaryArchSuffix}_devel
 	devel:eigen$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
-	devel:libboost_system$secondaryArchSuffix >= 1.88.0
+	devel:libboost_filesystem$secondaryArchSuffix >= 1.90.0
 	devel:libexiv2$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
@@ -173,7 +187,8 @@ BUILD_REQUIRES="
 	devel:liblqr_1$secondaryArchSuffix
 	devel:libMagick++_7.Q16HDRI$secondaryArchSuffix
 	devel:libopenal$secondaryArchSuffix
-	devel:libopencv_core$secondaryArchSuffix
+	devel:libopencv_core$secondaryArchSuffix >= 4.13
+	devel:libopencv_cvv$secondaryArchSuffix >= 4.13
 	devel:libpng16$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5WebEngine$secondaryArchSuffix
@@ -183,18 +198,6 @@ BUILD_REQUIRES="
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
-PROVIDES_devel="
-	digikam${secondaryArchSuffix}_devel = $portVersion compat >= 8
-	devel:libdigikamcore$secondaryArchSuffix = $portVersion compat >= 8
-	devel:libdigikamdatabase$secondaryArchSuffix = $portVersion compat >= 8
-	devel:libdigikamgui$secondaryArchSuffix = $portVersion compat >= 8
-	"
-REQUIRES_devel="
-	haiku$secondaryArchSuffix
-	digikam$secondaryArchSuffix == $portVersion base
-	"
-
 BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:cmake

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

@@ -1,29 +1,34 @@
-From 32ec748546e9bee48117c81a4a258aae8df4bb6a Mon Sep 17 00:00:00 2001
+From 6932713a2f6aa62a57089b1809bc7d80e80f073f Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Thu, 14 Mar 2024 22:51:39 +1000
 Subject: Fix build for Haiku
 
 
 diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake
-index 3383a46..985b018 100644
+index 5282f54..bd25bb8 100644
 --- a/core/app/DigikamCoreTarget.cmake
 +++ b/core/app/DigikamCoreTarget.cmake
-@@ -226,6 +226,10 @@ target_link_libraries(digikamcore
+@@ -226,6 +226,15 @@ target_link_libraries(digikamcore
                        Qt${QT_VERSION_MAJOR}::WebEngineWidgets
  )
  
 +if(HAIKU)
-+    target_link_libraries(digikamcore PUBLIC network iconv intl)
++    target_link_libraries(digikamcore
++                          PUBLIC
++                          network
++                          iconv
++                          intl
++    )
 +endif()
 +
  if(ENABLE_DBUS)
  
      target_link_libraries(digikamcore
 diff --git a/core/app/main/digikamapp_setup.cpp b/core/app/main/digikamapp_setup.cpp
-index 90d6783..0475920 100644
+index 4254951..28ea244 100644
 --- a/core/app/main/digikamapp_setup.cpp
 +++ b/core/app/main/digikamapp_setup.cpp
-@@ -886,7 +886,9 @@ void DigikamApp::setupActions()
+@@ -939,7 +939,9 @@ void DigikamApp::setupActions()
  
      // Load Themes
  
@@ -64,7 +69,7 @@ index 5f20d6c..990927f 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 48c70aa..f95f2a1 100644
+index 1b53090..21f47e0 100644
 --- a/core/libs/dimg/filters/curves/curveswidget.cpp
 +++ b/core/libs/dimg/filters/curves/curveswidget.cpp
 @@ -23,6 +23,7 @@
@@ -133,10 +138,10 @@ index ac0708e..3ee990b 100644
  #define __POSIX__
  #endif
 diff --git a/core/libs/settings/applicationsettings_miscs.cpp b/core/libs/settings/applicationsettings_miscs.cpp
-index 06bd987..72fbc61 100644
+index 2ac35fa..01a7f98 100644
 --- a/core/libs/settings/applicationsettings_miscs.cpp
 +++ b/core/libs/settings/applicationsettings_miscs.cpp
-@@ -530,7 +530,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
+@@ -540,7 +540,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
  
  QFont ApplicationSettings::getApplicationFont() const
  {
@@ -149,7 +154,7 @@ index 06bd987..72fbc61 100644
  
  bool ApplicationSettings::getHelpBoxNotificationSeen()
 diff --git a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
-index b04363e..0087e10 100644
+index aa3a734..9660476 100644
 --- a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
 +++ b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
 @@ -38,7 +38,7 @@ extern "C"
@@ -162,7 +167,7 @@ index b04363e..0087e10 100644
  #   include <sys/shm.h>
  #endif
 diff --git a/core/libs/widgets/mainview/thememanager.cpp b/core/libs/widgets/mainview/thememanager.cpp
-index ffd19ac..836287b 100644
+index 974548b..489b6fc 100644
 --- a/core/libs/widgets/mainview/thememanager.cpp
 +++ b/core/libs/widgets/mainview/thememanager.cpp
 @@ -83,6 +83,7 @@ void ThemeManager::setCurrentTheme(const QString& name)
@@ -198,7 +203,7 @@ index ffd19ac..836287b 100644
  
  void ThemeManager::updateCurrentDesktopDefaultThemePreview()
 diff --git a/core/showfoto/main/showfoto_setup.cpp b/core/showfoto/main/showfoto_setup.cpp
-index 41d1f06..0d55d2b 100644
+index e3c0eda..727b381 100644
 --- a/core/showfoto/main/showfoto_setup.cpp
 +++ b/core/showfoto/main/showfoto_setup.cpp
 @@ -19,7 +19,9 @@ namespace ShowFoto
@@ -212,10 +217,10 @@ index 41d1f06..0d55d2b 100644
  
      // Extra 'File' menu actions ---------------------------------------------
 diff --git a/core/showfoto/main/showfotosettings.cpp b/core/showfoto/main/showfotosettings.cpp
-index 79c5cbb..5eb0f88 100644
+index 1a910cd..8a8bc77 100644
 --- a/core/showfoto/main/showfotosettings.cpp
 +++ b/core/showfoto/main/showfotosettings.cpp
-@@ -294,7 +294,11 @@ QString ShowfotoSettings::getIconTheme() const
+@@ -305,7 +305,11 @@ QString ShowfotoSettings::getDateTimeFormat() const
  
  QFont ShowfotoSettings::getApplicationFont() const
  {
@@ -228,55 +233,54 @@ index 79c5cbb..5eb0f88 100644
  
  bool ShowfotoSettings::getShowSplash() const
 diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp
-index ae41f19..d9a01ed 100644
+index b1ab2fb..68d3452 100644
 --- a/core/showfoto/setup/showfotosetupmisc.cpp
 +++ b/core/showfoto/setup/showfotosetupmisc.cpp
-@@ -88,8 +88,9 @@ public:
+@@ -93,7 +93,9 @@ public:
      QComboBox*            sortOrderComboBox     = nullptr;
      QComboBox*            applicationStyle      = nullptr;
      QComboBox*            applicationIcon       = nullptr;
 +#ifndef Q_OS_HAIKU
      DFontSelect*          applicationFont       = nullptr;
--
 +#endif
+ 
      SystemSettingsWidget* systemSettingsWidget  = nullptr;
  
- #ifdef HAVE_SONNET
-@@ -298,8 +299,10 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
-         d->applicationIcon->addItem(it.key(), it.value());
-     }
+@@ -313,8 +315,10 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
+     d->dateTimeFormatReset->setIcon(QIcon::fromTheme(QLatin1String("document-revert")));
+     d->dateTimeFormatReset->setToolTip(i18n("Reverts to the local short date and time format"));
  
 +#ifndef Q_OS_HAIKU
-     d->applicationFont = new DFontSelect(i18n("Application font:"), appearancePanel);
+     d->applicationFont        = new DFontSelect(i18n("Application font:"), appearancePanel);
      d->applicationFont->setToolTip(i18n("Select here the font used to display text in whole application."));
 +#endif
  
      // --------------------------------------------------------
  
-@@ -310,7 +313,9 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
-     layout2->addWidget(tabStyleHbox);
-     layout2->addWidget(appStyleHbox);
-     layout2->addWidget(iconThemeHbox);
+@@ -330,7 +334,9 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
+     layout2->addWidget(d->applicationIcon,       4, 1, 1, 1);
+     layout2->addWidget(d->dateTimeFormatLabel,   5, 0, 1, 1);
+     layout2->addWidget(dtFormatHBox,             5, 1, 1, 1);
 +#ifndef Q_OS_HAIKU
-     layout2->addWidget(d->applicationFont);
+     layout2->addWidget(d->applicationFont,       6, 0, 1, 2);
 +#endif
-     layout2->addStretch();
+     layout2->setColumnStretch(1, 10);
+     layout2->setRowStretch(7, 10);
  
-     d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
-@@ -407,7 +412,9 @@ void ShowfotoSetupMisc::readSettings()
- #endif
+@@ -436,7 +442,9 @@ void ShowfotoSetupMisc::readSettings()
  
      d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(d->settings->getIconTheme()));
+     d->dateTimeFormatEdit->setText(d->settings->getDateTimeFormat());
 +#ifndef Q_OS_HAIKU
      d->applicationFont->setFont(d->settings->getApplicationFont());
 +#endif
  
      // NOTE: Spellcheck and Localize read settings is done in widget constructor.
  }
-@@ -435,7 +442,9 @@ void ShowfotoSetupMisc::applySettings()
- #endif
+@@ -465,7 +473,9 @@ void ShowfotoSetupMisc::applySettings()
  
      d->settings->setIconTheme(d->applicationIcon->currentData().toString());
+     d->settings->setDateTimeFormat(d->dateTimeFormatEdit->text().trimmed());
 +#ifndef Q_OS_HAIKU
      d->settings->setApplicationFont(d->applicationFont->font());
 +#endif
@@ -284,7 +288,7 @@ index ae41f19..d9a01ed 100644
  
  #ifdef HAVE_SONNET
 diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp
-index c5fdea4..cf2d0f0 100644
+index 3260787..6469c6b 100644
 --- a/core/utilities/import/backend/gpcamera.cpp
 +++ b/core/utilities/import/backend/gpcamera.cpp
 @@ -59,6 +59,10 @@ extern "C"
@@ -299,5 +303,5 @@ index c5fdea4..cf2d0f0 100644
  
  // LibGphoto2 includes
 -- 
-2.51.0
+2.52.0