Accepting request 1101149 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/1101149 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=215
This commit is contained in:
commit
f0c86bd102
@ -1,24 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:102c712b6209fe2ac877c9b1d019dacadaf115adf915570d26816066d151e847
|
|
||||||
size 35857384
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmQ3DvcACgkQSnd0e8I4
|
|
||||||
blDYng/+PV90HbflMiTV1w/DDAyjTLIEP6KslaXlGCZ7NM8XzNLPUn4VC8zXdtGB
|
|
||||||
JCJyijYpvFmT+Kd1Y0zpxKlLF05/110BgfZ6PzusI+oz0X3yckoHZ+f373Om/LGV
|
|
||||||
UmMxAnV7nOlXIvrMjzqPkGe/rc3JNAU0relN4xp//X7TrMG/OSAdBW9zYAxhQ8Oq
|
|
||||||
7pkKrAUZClUeit1e0iCXceEv8/e2i5NJG+Qo3SZZCgx1yTl/nbc/h8pKrLMv4+tQ
|
|
||||||
/02UxBsNByPRHRSjxWWG8BRzHB5LN18iO2GWkzP/fOXxXEPrIuQ5yS2r+yNZUvkJ
|
|
||||||
p2Dnm4HrwR3iIz5Qwf6Xk3AA1L8e4MRNKiW8odBw+xOB6NmY2uc0NHcXgipaREAg
|
|
||||||
6wsV3r8JM17q4dqwyzZ7neXD7MLWnfo953nJHkxl8raBYTpq5UKQqNV/Hgjp38Dr
|
|
||||||
MkkBpy43Hle44c8VzNxTDWxUUeOholzh4XADccM53GXKAT+lPAny/rnpDkYL1sql
|
|
||||||
w1wQQOIUHqC2gLWtCSQCXWS5OXb/MfC4oQhl10hC1ajz9//FESFlbt0KsIG/xkzz
|
|
||||||
0tfLNUt5CbKIysGIsZvKKWQtq4rR54PODIf0GLkGoDrYuOE1Iofai+AtMQc98avY
|
|
||||||
S9nb6n6T0kcQmE1FzyaQxppe3mciYG26Vc0Z3T7ujBQJVIvZ9rM=
|
|
||||||
=9CWb
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
digiKam-8.1.0.tar.xz
Normal file
3
digiKam-8.1.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0503c034e445ff424f18a6715c0a7a79be4a5e0c82b3ebc461a21cec3745a5b3
|
||||||
|
size 35712348
|
16
digiKam-8.1.0.tar.xz.sig
Normal file
16
digiKam-8.1.0.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmSlsEcACgkQSnd0e8I4
|
||||||
|
blB+PxAArcaeS84CPA22YbWfEkpManuFYQe5U+yhbRoBT2mOUl2gttyA3v5pcfMa
|
||||||
|
kVbASl1sq4yVF6CKImXI0KeLEZyJZVeG553+79sqxfktTdbZ7xMfNWtg8hoLfxe9
|
||||||
|
gSGjjxVPA4XieuGgJYgKcUrVBU4stYVXuZvMGl4cJrHncFAkiMouqPIiLvboJMiL
|
||||||
|
wHZ2WHIx2cZIW6GswTRc8fK3FUAUWScCt3v7mnvOcplTKA4504ro/eLDjb1yu3ZW
|
||||||
|
1kP4TbbTlRNvBry92XfbBPk3UFvlhIEK+9n2aUvS7pBy3cLWo5KHKYAT227UIjiv
|
||||||
|
1YipRKxaEpXyxtd4gFPMWYZb1bwF0yp3s+4JIJ54zaZ2w/nuEAp1tEP5irtMMmnj
|
||||||
|
S5Mb5o9Q21aybsnssnwVR9bvaME2lfOPlBSwtsRm490XA3UEfdAAzscHoXPyDJK6
|
||||||
|
FWg35oNtGHLPEHGYXKkz+G5mRofhPaBIvnHBIDK1YI1MpTBki4AgOjTbQtFBXzEK
|
||||||
|
dTL3MiGMtbDGKcJn3gepqe0Wklk+PrjNw3GJi1VZgOJLdOKedR2WJ/P1yaUUfLTl
|
||||||
|
XLR+HzhU2mi1HaH0/IdNWf847t783p6SR4v4pYhMWo0N8n2c3ghZNZci25diooR7
|
||||||
|
guCGQO7cCcKtSfbRaebiYY9ytat6BAApm/ikJ115CycHJHj36IY=
|
||||||
|
=uPws
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 28 05:34:21 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- Update to 8.1.0:
|
||||||
|
https://www.digikam.org/news/2023-07-09-8.1.0_release_announcement/
|
||||||
|
- Drop patch, merged upstream:
|
||||||
|
* 0001-fix-broken-compilation-with-Exiv2-0.28-missing-heade.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jul 4 06:56:45 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
Tue Jul 4 06:56:45 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
11
digikam.spec
11
digikam.spec
@ -16,11 +16,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define soversion 8_0_0
|
%define soversion 8_1_0
|
||||||
%bcond_without released
|
%bcond_without released
|
||||||
%bcond_with apidocs
|
%bcond_with apidocs
|
||||||
Name: digikam
|
Name: digikam
|
||||||
Version: 8.0.0
|
Version: 8.1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A KDE Photo Manager
|
Summary: A KDE Photo Manager
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@ -30,7 +30,6 @@ 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
|
||||||
@ -241,9 +240,9 @@ sed -i 's#KF5::AkonadiCore#KPim5::AkonadiCore#' core/utilities/extrasupport/addr
|
|||||||
|
|
||||||
%files -n libdigikamcore%{soversion}
|
%files -n libdigikamcore%{soversion}
|
||||||
%license LICENSES/*
|
%license LICENSES/*
|
||||||
%{_kf5_libdir}/libdigikamcore.so.8.0.0
|
%{_kf5_libdir}/libdigikamcore.so.%{version}
|
||||||
%{_kf5_libdir}/libdigikamdatabase.so.8.0.0
|
%{_kf5_libdir}/libdigikamdatabase.so.%{version}
|
||||||
%{_kf5_libdir}/libdigikamgui.so.8.0.0
|
%{_kf5_libdir}/libdigikamgui.so.%{version}
|
||||||
|
|
||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user