pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/digikam revision 201.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=c7d9df22e08341f4f051035e73c21c6e
This commit is contained in:
OBS User buildservice-autocommit 2022-01-12 23:22:19 +00:00 committed by Git OBS Bridge
parent d983511d47
commit 2b76cc8580
8 changed files with 185 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch
View File

@ -1,25 +1,27 @@
From 64454b942be9c61f3c981f7a18a77b332944d58a Mon Sep 17 00:00:00 2001
From bb399cd140e1b22f46b019f9b0bc14e62b270ab7 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 12 Nov 2019 11:15:21 +0100
Subject: [PATCH] Revert "Exiv2 is now released with exported targets using
cmake rules. No need to have a dedicated find exiv2 cmake script. Bump
Date: Tue, 14 Dec 2021 17:02:22 +0100
Subject: [PATCH] Revert "Exiv2 is now released with exported targets using
cmake rules. No need to have a dedicated find exiv2 cmake script. Bump
minimal version to 0.27.1"
This reverts commit 06e77271d72fe5e4abeb38641f3addc2cfbff126.
Also, it replaces the use of `Exiv2::XmpData::eraseFamily()` (new in
exiv2-0.27) with inline code copied from exiv2-0.27.5.
Fixes build on Leap 15.x which only have exiv2 0.26.
As there haven't been any changes other than to rely on the new cmake
files in exiv2 0.27, there should be no problems with the older version.
---
core/CMakeLists.txt | 14 +--
core/app/DigikamCoreTarget.cmake | 2 +-
core/cmake/modules/FindExiv2.cmake | 116 ++++++++++++++++++++++++++++++++
core/libs/metadataengine/CMakeLists.txt | 10 ++-
4 files changed, 126 insertions(+), 16 deletions(-)
core/CMakeLists.txt | 14 +--
core/app/DigikamCoreTarget.cmake | 2 +-
core/cmake/modules/FindExiv2.cmake | 116 ++++++++++++++++++
core/libs/metadataengine/CMakeLists.txt | 10 +-
.../metadataengine/engine/metaengine_xmp.cpp | 23 +++-
5 files changed, 148 insertions(+), 17 deletions(-)
create mode 100644 core/cmake/modules/FindExiv2.cmake
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index e31e267772..d14364dc1e 100644
index 16bba83335..174dc3c683 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -16,7 +16,7 @@ message(STATUS "")
@ -31,7 +33,7 @@ index e31e267772..d14364dc1e 100644
set(OPENCV_MIN_VERSION "3.3.0")
set(LENSFUN_MIN_VERSION "0.2.6.0") # For Lens auto-correction plugin
set(QTAV_MIN_VERSION "1.12.0") # For video support.
@@ -180,9 +180,9 @@ if(NOT X265_FOUND)
@@ -180,19 +180,15 @@ if(NOT X265_FOUND)
set(X265_LIBRARIES "")
endif()
@ -43,7 +45,6 @@ index e31e267772..d14364dc1e 100644
DESCRIPTION "Required to build digiKam"
URL "https://www.exiv2.org"
TYPE RECOMMENDED
@@ -189,10 +189,6 @@ set_package_properties("Exiv2" PROPERTIES
PURPOSE "Library to manage image metadata"
)
@ -63,7 +64,7 @@ index e31e267772..d14364dc1e 100644
PRINT_LIBRARY_STATUS("libexpat" "https://libexpat.github.io" "(version >= 2.0.0)" EXPAT_FOUND)
PRINT_LIBRARY_STATUS("libjpeg" "https://github.com/libjpeg-turbo/libjpeg-turbo" "(version >= 6b)" JPEG_FOUND)
PRINT_LIBRARY_STATUS("libkde" "https://www.kde.org" "(version >= ${KF5_MIN_VERSION})" KF5_FOUND)
@@ -622,7 +618,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("OpenGL" "https://www.mesa3d.org"
@@ -622,7 +618,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("libqtxmlpatterns" "https://www.qt.io"
# ==============================================================================
if(Boost_FOUND AND
@ -73,10 +74,10 @@ index e31e267772..d14364dc1e 100644
JPEG_FOUND AND
KF5_FOUND AND
diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake
index 72b424cb36..7aa6dc5a1e 100644
index b9ec794684..d11ebc9120 100644
--- a/core/app/DigikamCoreTarget.cmake
+++ b/core/app/DigikamCoreTarget.cmake
@@ -144,7 +144,7 @@ target_link_libraries(digikamcore
@@ -145,7 +145,7 @@ target_link_libraries(digikamcore
${TIFF_LIBRARIES}
PNG::PNG
${JPEG_LIBRARIES}
@ -208,10 +209,10 @@ index 0000000000..912ffaee0c
+
+mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY)
diff --git a/core/libs/metadataengine/CMakeLists.txt b/core/libs/metadataengine/CMakeLists.txt
index 64754c882c..da6fac050a 100644
index 9e3a026035..596c701516 100644
--- a/core/libs/metadataengine/CMakeLists.txt
+++ b/core/libs/metadataengine/CMakeLists.txt
@@ -9,16 +9,15 @@
@@ -9,16 +9,15 @@ APPLY_COMMON_POLICIES()
kde_enable_exceptions()
@ -231,7 +232,7 @@ index 64754c882c..da6fac050a 100644
DISABLE_GCC_COMPILER_WARNINGS("5.99.99" "-Wno-deprecated")
@@ -81,14 +80,13 @@ set(libdmetadata_SRCS
@@ -90,14 +89,13 @@ set(libdmetadata_SRCS
)
include_directories(
@ -247,6 +248,40 @@ index 64754c882c..da6fac050a 100644
)
# Used by digikamcore
diff --git a/core/libs/metadataengine/engine/metaengine_xmp.cpp b/core/libs/metadataengine/engine/metaengine_xmp.cpp
index f5d694dfc9..ff7771001a 100644
--- a/core/libs/metadataengine/engine/metaengine_xmp.cpp
+++ b/core/libs/metadataengine/engine/metaengine_xmp.cpp
@@ -1234,7 +1234,28 @@ bool MetaEngine::removeXmpTag(const char* xmpTagName, bool family) const
}
else
{
- d->xmpMetadata().eraseFamily(it);
+ // https://github.com/Exiv2/exiv2/issues/521
+ // delete 'children' of XMP composites (XmpSeq and XmpBag)
+
+ // I build a StringVector of keys to remove
+ // Then I remove them with erase(....)
+ // erase() has nasty side effects on its argument
+ // The side effects are avoided by the two-step approach
+ // https://github.com/Exiv2/exiv2/issues/560
+ std::string key(it->key());
+ Exiv2::StringVector keys;
+ while ( it != d->xmpMetadata().end() ) {
+ if ( it->key().find(key)==0 ) {
+ keys.push_back(it->key());
+ it++;
+ } else {
+ break;
+ }
+ }
+ // now erase the family!
+ for ( Exiv2::StringVector_i i = keys.begin() ; i != keys.end() ; i++ ) {
+ d->xmpMetadata().erase(d->xmpMetadata().findKey(Exiv2::XmpKey(*i)));
+ }
}
return true;
--
2.16.4
2.31.1

31
Fix-compile-for-newer-Akonadi-Build-Versions.patch
View File

@ -1,31 +0,0 @@
From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
Date: Sat, 2 Oct 2021 21:50:04 +0300
Subject: [PATCH] Fix compile for newer Akonadi Build Versions
---
core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
index 8e43dad0da..cb38036e39 100644
--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
@@ -41,7 +41,14 @@
#endif
#include <kjob.h>
+#include <akonadi_version.h>
+
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include <Akonadi/Item>
+#else
#include <AkonadiCore/Item>
+#endif
+
#include <Akonadi/Contact/ContactSearchJob>
#include <KContacts/Addressee>
--
GitLab

3
digiKam-7.4.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d08ab66da732bb449bc10106ec11dd9defa5b3562ded3741b041dbbaa715504a
size 339575096

16
digiKam-7.4.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmG0fesACgkQSnd0e8I4
blCf7A//fR+EmuZgto3cQXcck6XB7dNh5vJeQAxf28mpxbg/Cd+RPYYh6RJunW2C
ml/VQ+f1HVhxPe2/n9li9EWPzGsiAG/vlhAHdZuePEtVKazYSFK9mms51uu/gnBA
JyA9GwAM26rI/kvlT0u4WLMRB2s55In2IWa+qxqSO4PCcvQrFerxFdlKsD0l+2dt
8/Kf/m2tIvtX8DFn9+gi2f6jp2cuuIbDLixO3zVdzZT4p6r8wD6Bq/myG55m8d4Z
7TciLof0P+7bEOYVxBA6ehhKoLUOoF5TAOxi4l6qj3zPgj8IeaigZF5hVUshsIdm
Xe/UnsIC1m08uc0fyaSYRnoZR678ayhqjacWUCrJifjDWe/QjiqHkY+1EnKm91M6
VMQqiViQTsRJ5xFBkzt0HqD3wbaHPVC+0OoaGN/0SvbVkVeMG72KzzFxUREEJWh5
FMD+4aM9011g7DkdkaaCXRqjQCnl0CMGtdf71EFjBiqixCOVd5SUfgiq1kW5ejH7
+RwGH32LWbvovJKFuQNkJCa2B/tq8xzuDJ0/iOVbQ4X/pLl6Wi5jMvtz/CudXDXN
N7hPJPCjowjl7dGVANBCxDjUmTHfMKOx/FA6WcigKyoliDUm1by6nz6/lqu8PQXx
FYuYwWir+CCr/qiPbyy06jtKRh5aiu1sDPjUm8gkLmG9zsszgY0=
=LwPS
-----END PGP SIGNATURE-----

3
digikam-7.3.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95aea93be1cfd39bb52333b82b3e57bf68080c7d1319d754d167a20f6dbe4551
size 256985340

49
digikam.changes
View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Sat Dec 18 15:27:40 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
- Update to 7.4.0
* https://www.digikam.org/news/2021-12-17-7.4.0_release_announcement/
- New features (from NEWS):
Bundles : AppImage is now compiled under Mageia 7.1 instead 6.1 for
a better binary compatibility with recent Linux.
Bundles : AppImage use last Qt 5.15.2 and KF5 5.84 libraries.
Bundles : Last stable Exiv2 0.27.5 is now used to compile Windows,
AppImage, and MacOS bundles.
Plugins : New tool to share items on the network with a Motion JPEG
stream server.
Showfoto: Add new left sidebar hosting a folder-view to quickly
explore images from local file system.
Showfoto: Add new left sidebar hosting a stack-view to host
favorite contents.
Database: Add the ability to use a local SQLite thumbnail database
with an external MySQL configuration.
General : Integration of Image Quality Sorter Google Summer of Code
project 2021 from Phuoc Khanh LE
<https://community.kde.org/GSoC/2021/StatusReports/PhuocKhanhLE>
General : Update internal Libraw to snapshot 202110
* Camera Format support:
- Sony Lossless compressed support
- Panasonic v6/12 bit
* Camera support:
- DJI Mavic Air 2S
- Fujifilm GFX 50S II; GFX 100S, X-E4
- GoPro HERO9, HERO10 (if compiled w/ USE_GPR_SDK)
- Nikon Z fc
- Panasonic GH5 Mark II
- Pentax K3 Mark III
- Olympus E-P7
- Ricoh GR IIIx
- Sony A1, A7R-IIIA (ILCE-7RM3A), A7R-IVA (ILCE-7RM4A),
ZV-E10
- Canon EOS M50 Mark II was supported but not listed in
camera list
- 209 bugs fixed
- Drop Fix-compile-for-newer-Akonadi-Build-Versions.patch, merged
upstream
- Update 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch
to avoid the use of a function that was added in exiv2-0.27
- Readd libjasper-devel BuildRequires to reenable JPEG2000 support,
it's back in Tumbleweed since a while
- Drop redundant recommendation of the -lang package
- Add signature file and keyring
-------------------------------------------------------------------
Wed Dec 1 11:06:53 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>

51
digikam.keyring Normal file
View File

@ -0,0 +1,51 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
OpS41AbCXr4KYv+6xXM7Al5Oh7ztYBn/1Q==
=+PZP
-----END PGP PUBLIC KEY BLOCK-----

19
digikam.spec
View File

@ -17,20 +17,22 @@
%define soversion 7
%bcond_without lang
%bcond_without released
%bcond_with apidocs
Name: digikam
Version: 7.3.0
Version: 7.4.0
Release: 0
Summary: A KDE Photo Manager
License: GPL-2.0-or-later
Group: Productivity/Graphics/Viewers
URL: https://www.digikam.org/
Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
Source0: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig
Source2: %{name}.keyring
%endif
# PATCH-FIX-OPENSUSE -- Lower minimum exiv2 version to 0.26
Patch0: 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch
# PATCH-FIX-UPSTREAM
Patch1: Fix-compile-for-newer-Akonadi-Build-Versions.patch
# QtWebEngine is not available on ppc and zSystems
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{mips} %{riscv}
BuildRequires: QtAV-devel >= 1.12
@ -44,6 +46,7 @@ BuildRequires: libboost_graph-devel
BuildRequires: libeigen3-devel
BuildRequires: libexiv2-devel >= 0.26
BuildRequires: libexpat-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg8-devel
BuildRequires: liblcms2-devel
BuildRequires: liblqr-devel
@ -99,7 +102,6 @@ BuildRequires: pkgconfig(libgphoto2) >= 2.4.0
BuildRequires: pkgconfig(libswscale)
Requires: %{name}-plugins
Requires: libQt5Sql5-sqlite
Recommends: %{name}-lang
Recommends: marble
Recommends: showfoto
# Got merged into libimageeditor in 5.2.0
@ -169,7 +171,6 @@ The main digikam libraries that are being shared between showfoto and digikam
# Leap 15 only has exiv2 0.26
%patch0 -p1
%endif
%patch1 -p1
%build
%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON
@ -187,7 +188,7 @@ The main digikam libraries that are being shared between showfoto and digikam
%suse_update_desktop_file -r org.kde.showfoto Qt KDE Graphics Photography
%endif
%if %{with lang}
%if %{with released}
%find_lang %{name} --without-kde
%endif
@ -244,7 +245,7 @@ The main digikam libraries that are being shared between showfoto and digikam
%{_kf5_libdir}/libdigikamdatabase.so.%{soversion}.*
%{_kf5_libdir}/libdigikamgui.so.%{soversion}.*
%if %{with lang}
%if %{with released}
%files lang -f %{name}.lang
%endif