Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2022-01-13 00:22:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Thu Jan 13 00:22:19 2022 rev:201 rq:945685 version:7.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2021-12-02 02:11:37.555326628 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new.1892/digikam.changes 2022-01-13 00:23:06.943962427 +0100 @@ -1,0 +2,49 @@ +Sat Dec 18 15:27:40 UTC 2021 - Wolfgang Bauer <wba...@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 + +------------------------------------------------------------------- Old: ---- Fix-compile-for-newer-Akonadi-Build-Versions.patch digikam-7.3.0.tar.xz New: ---- digiKam-7.4.0.tar.xz digiKam-7.4.0.tar.xz.sig digikam.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.5WCcg1/_old 2022-01-13 00:23:10.371964894 +0100 +++ /var/tmp/diff_new_pack.5WCcg1/_new 2022-01-13 00:23:10.375964897 +0100 @@ -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: 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(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 @@ # 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 @@ %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 @@ %{_kf5_libdir}/libdigikamdatabase.so.%{soversion}.* %{_kf5_libdir}/libdigikamgui.so.%{soversion}.* -%if %{with lang} +%if %{with released} %files lang -f %{name}.lang %endif ++++++ 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch ++++++ --- /var/tmp/diff_new_pack.5WCcg1/_old 2022-01-13 00:23:10.395964912 +0100 +++ /var/tmp/diff_new_pack.5WCcg1/_new 2022-01-13 00:23:10.399964914 +0100 @@ -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 <wba...@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 @@ 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 @@ 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 @@ 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 @@ 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 @@ + +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 @@ 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,7 +248,41 @@ ) # 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
