From e7ffc723d80f185e5f7101c4c8f157028a577b2a Mon Sep 17 00:00:00 2001 From: nucleo Date: Oct 11 2021 22:14:16 +0000 Subject: backport fix for s390x --- diff --git a/digikam-7.3.0-s390x.patch b/digikam-7.3.0-s390x.patch new file mode 100644 index 0000000..6ceba9d --- /dev/null +++ b/digikam-7.3.0-s390x.patch @@ -0,0 +1,27 @@ +From 74fb80fa0b49efbbcfa274ff08677f269283a745 Mon Sep 17 00:00:00 2001 +From: Maik Qualmann +Date: Mon, 11 Oct 2021 22:58:09 +0200 +Subject: [PATCH] try to fix compile DNG-SDK on s390x Next problem can be + libraw. CCBUGS: 443606 + +--- + core/libs/dngwriter/extra/dng_sdk/dng_flags.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_flags.h b/core/libs/dngwriter/extra/dng_sdk/dng_flags.h +index c959fad6ad..ea45e08179 100644 +--- a/core/libs/dngwriter/extra/dng_sdk/dng_flags.h ++++ b/core/libs/dngwriter/extra/dng_sdk/dng_flags.h +@@ -190,6 +190,9 @@ + #if defined(qDNGLittleEndian) + #define qDNGBigEndian !qDNGLittleEndian + ++#elif defined(__s390__) || defined(__s390x__) ++#define qDNGBigEndian 1 ++ + #elif defined(__POWERPC__) + #define qDNGBigEndian 1 + +-- +GitLab + diff --git a/digikam.spec b/digikam.spec index 7246bca..9ccdb36 100644 --- a/digikam.spec +++ b/digikam.spec @@ -24,6 +24,8 @@ Source0: http://download.kde.org/stable/digikam/%{version}/digikam-%{version}.ta Source10: digikam-import.desktop ## upstream patches +# backport fix for s390x build https://invent.kde.org/graphics/digikam/commit/74fb80fa0b49efbbcfa274ff08677f269283a745 +Patch10: digikam-7.3.0-s390x.patch ## upstreamable patches @@ -157,6 +159,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} +%patch10 -p1 -b .s390x %build %cmake_kf5 \