Accepting request 1096679 from KDE:Extra

Exiv 0.28 fixes

OBS-URL: https://build.opensuse.org/request/show/1096679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=214
This commit is contained in:
Dominique Leuenberger 2023-07-04 13:22:40 +00:00 committed by Git OBS Bridge
commit 2be900b6da
3 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,24 @@
From 4896cef032ed2468b927d770ae26d0a3e2de07b8 Mon Sep 17 00:00:00 2001
From: Gilles Caulier <caulier.gilles@gmail.com>
Date: Mon, 15 May 2023 07:18:40 +0200
Subject: [PATCH] fix broken compilation with Exiv2 0.28 (missing header)
---
core/libs/metadataengine/engine/metaengine_p.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/libs/metadataengine/engine/metaengine_p.h b/core/libs/metadataengine/engine/metaengine_p.h
index 93c91c8d99..d3c9148dac 100644
--- a/core/libs/metadataengine/engine/metaengine_p.h
+++ b/core/libs/metadataengine/engine/metaengine_p.h
@@ -89,6 +89,7 @@
# define AutoPtr UniquePtr
# define AnyError Error
# define kerErrorMessage ErrorCode::kerErrorMessage
+# include <exiv2/photoshop.hpp>
#endif
#if EXIV2_TEST_VERSION(0,27,4)
--
2.41.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 4 06:56:45 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Add patch:
* 0001-fix-broken-compilation-with-Exiv2-0.28-missing-heade.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 20 11:43:43 UTC 2023 - Christophe Marin <christophe@krop.fr> Thu Apr 20 11:43:43 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -30,6 +30,7 @@ Source0: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{ver
Source1: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig Source1: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig
Source2: %{name}.keyring Source2: %{name}.keyring
%endif %endif
Patch0: 0001-fix-broken-compilation-with-Exiv2-0.28-missing-heade.patch
# QtWebEngine is not available on ppc and zSystems # QtWebEngine is not available on ppc and zSystems
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{riscv} ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{riscv}
BuildRequires: QtAV-devel >= 1.12 BuildRequires: QtAV-devel >= 1.12