diff --git a/media-gfx/digikam/digikam-7.6.0.recipe b/media-gfx/digikam/digikam-7.6.0.recipe index 7e82dee33..ebcd68679 100644 --- a/media-gfx/digikam/digikam-7.6.0.recipe +++ b/media-gfx/digikam/digikam-7.6.0.recipe @@ -6,7 +6,7 @@ photos and RAW files." HOMEPAGE="https://digikam.org/" COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="4" +REVISION="5" SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digiKam-$portVersion.tar.xz" CHECKSUM_SHA256="d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641" SOURCE_DIR="digikam-$portVersion" @@ -113,9 +113,9 @@ BUILD_REQUIRES=" devel:eigen$secondaryArchSuffix devel:libGL$secondaryArchSuffix devel:libGLU$secondaryArchSuffix - devel:libavcodec$secondaryArchSuffix - devel:libavformat$secondaryArchSuffix - devel:libavutil$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix >=58.54.100 + devel:libavformat$secondaryArchSuffix >= 58.29.100 + devel:libavutil$secondaryArchSuffix >= 56.31.100 devel:libboost_system$secondaryArchSuffix devel:libexiv2$secondaryArchSuffix devel:libexpat$secondaryArchSuffix diff --git a/media-gfx/digikam/patches/digikam-7.6.0.patchset b/media-gfx/digikam/patches/digikam-7.6.0.patchset index 6c68b0edd..b59e2d556 100644 --- a/media-gfx/digikam/patches/digikam-7.6.0.patchset +++ b/media-gfx/digikam/patches/digikam-7.6.0.patchset @@ -1,4 +1,4 @@ -From ae5b06f79b4a18afebed0c6d50c57a857475b947 Mon Sep 17 00:00:00 2001 +From 73d39a7ac7cfe45f281a939bd3e0c2c2188066e4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 May 2022 13:47:35 +1000 Subject: Fix build for Haiku @@ -386,5 +386,28 @@ index 8986c23..4949d7b 100644 } // namespace Digikam -- -2.30.2 +2.37.3 + + +From 1493e42c4659de97e186b549048045676567ceeb Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sun, 13 Aug 2023 17:57:59 +0000 +Subject: Build fix for isdigit + + +diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp +index fa58711..8a58dda 100644 +--- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp ++++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp +@@ -23,7 +23,7 @@ + #include + #endif + +-#if qiPhone || qAndroid ++#if qiPhone || qAndroid || __HAIKU__ + #include // for isdigit + #endif + +-- +2.37.3