rpms/digikam
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt by autoport with build requirements: libMagick-devel>=7.1.0.35-1mamba [release 7.6.0-2mamba;Wed May 25 2022]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 21:47:28 +01:00
parent 40e13c555b
commit 9b91b37fc9
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
digikam-7.6.0-libakonadi-22.04.1.patch Normal file
View File

@ -0,0 +1,28 @@
From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Fri, 22 Apr 2022 19:13:28 +0200
Subject: [PATCH] Fix build with akonadi-contacts 22.04
---
core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
index 6a78863cf6..8e65a405da 100644
--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
@@ -49,7 +49,11 @@
#include <AkonadiCore/Item>
#endif
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
+#include <Akonadi/ContactSearchJob>
+#else
#include <Akonadi/Contact/ContactSearchJob>
+#endif
#include <KContacts/Addressee>
#if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
--
GitLab

16
digikam.spec
View File

@ -3,7 +3,7 @@
Name: digikam
Version: 7.6.0
Release: 1mamba
Release: 2mamba
Summary: An advanced digital photo management application Linux, Windows and Mac-OSX
Group: Graphical Desktop/Applications/Graphics
Vendor: openmamba
@ -14,6 +14,7 @@ Source: http://download.kde.org/stable/digikam/%{version}/digiKam-%{pkgve
Patch0: digikam-5.0.0_beta4-add_libastro.patch
Patch1: digikam-5.0.0_beta4-upstream-fix-1.patch
Patch2: digikam-5.1.0-gcc-6.1.patch
Patch3: digikam-7.6.0-libakonadi-22.04.1.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -88,7 +89,7 @@ BuildRequires: perl-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
## AUTOBUILDREQ-END
BuildRequires: libMagick-devel >= 7.0.9.4-1mamba
BuildRequires: libMagick-devel >= 7.1.0.35-1mamba
BuildRequires: libgphoto2-devel >= 1:2.5.19-1mamba
BuildRequires: libmarble-devel >= 17.08.0-1mamba
BuildRequires: libkipi5-devel >= 16.12.0-1mamba
@ -253,8 +254,12 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%prep
%setup -q -n %{name}-%{pkgver}
#-D -T
#:<< _EOF
%patch3 -p1 -b .libakonadi-22.04.1
%build
#:<< _EOF
%cmake_kde5 -d build \
-DCMAKE_BUILD_TYPE=Release \
-DDIGIKAMSC_COMPILE_DOC=OFF \
@ -270,7 +275,9 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
# -DWITH_OpenGL:BOOL=false
#%endif
%make || %make -j1
%make
#|| %make -j1
%install
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
@ -333,6 +340,9 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%{_libdir}/cmake/DigikamPlugin/DigikamPluginConfig.cmake
%changelog
* Wed May 25 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 7.6.0-2mamba
- rebuilt by autoport with build requirements: libMagick-devel>=7.1.0.35-1mamba
* Wed Mar 02 2022 Automatic Build System <autodist@mambasoft.it> 7.6.0-1mamba
- automatic version update by autodist