Accepting request 906404 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/906404
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=197

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

@@ -31,7 +31,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.
-@@ -178,9 +178,9 @@ if(NOT X265_FOUND)
+@@ -180,9 +180,9 @@ if(NOT X265_FOUND)
      set(X265_LIBRARIES "")
  endif()
  
@@ -43,7 +43,7 @@ index e31e267772..d14364dc1e 100644
                         DESCRIPTION "Required to build digiKam"
                         URL         "https://www.exiv2.org"
                         TYPE        RECOMMENDED
-@@ -187,10 +187,6 @@ set_package_properties("Exiv2"     PROPERTIES
+@@ -189,10 +189,6 @@ set_package_properties("Exiv2"     PROPERTIES
                         PURPOSE     "Library to manage image metadata"
  )
  
@@ -54,7 +54,7 @@ index e31e267772..d14364dc1e 100644
  # -- check Media player --------------------------------------------------------
  
  find_package(FFmpeg COMPONENTS AVCODEC AVDEVICE AVFILTER AVFORMAT AVUTIL SWSCALE)
-@@ -535,7 +531,7 @@ PRINT_COMPONENT_COMPILE_STATUS("QWebEngine Support"      ENABLE_QWEBENGINE)
+@@ -579,7 +575,7 @@ PRINT_COMPONENT_COMPILE_STATUS("QWebEngine Support"      ENABLE_QWEBENGINE)
  # ==============================================================================
  
  PRINT_LIBRARY_STATUS("libboostgraph" "https://www.boost.org/doc/libs"                    "(version >= 1.43.0)"                Boost_FOUND)
@@ -63,7 +63,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)
-@@ -576,7 +572,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("OpenGL"            "https://www.mesa3d.org"
+@@ -622,7 +618,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("OpenGL"            "https://www.mesa3d.org"
  # ==============================================================================
  
  if(Boost_FOUND                          AND
@@ -76,7 +76,7 @@ diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake
 index 72b424cb36..7aa6dc5a1e 100644
 --- a/core/app/DigikamCoreTarget.cmake
 +++ b/core/app/DigikamCoreTarget.cmake
-@@ -143,7 +143,7 @@ target_link_libraries(digikamcore
+@@ -144,7 +144,7 @@ target_link_libraries(digikamcore
                        ${TIFF_LIBRARIES}
                        PNG::PNG
                        ${JPEG_LIBRARIES}
@@ -231,13 +231,14 @@ index 64754c882c..da6fac050a 100644
  
      DISABLE_GCC_COMPILER_WARNINGS("5.99.99" "-Wno-deprecated")
  
-@@ -72,13 +71,12 @@ set(libdmetadata_SRCS
+@@ -81,14 +80,13 @@ set(libdmetadata_SRCS
  )
  
  include_directories(
 +    ${EXIV2_INCLUDE_DIR}
      $<TARGET_PROPERTY:Qt5::Gui,INTERFACE_INCLUDE_DIRECTORIES>
      $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
+     $<TARGET_PROPERTY:Qt5::Xml,INTERFACE_INCLUDE_DIRECTORIES>
  
      $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
      $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>

Fix-build-after-Qt-commit-f8ad329f.patch

@@ -1,29 +0,0 @@
-From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 16 Apr 2021 19:45:05 +0200
-Subject: [PATCH] Fix build after Qt commit
- f8ad329f7ee01993c388f78851fc4ac88f5093b4
-
-Build fails after this commit when using QT_NO_CAST_FROM_ASCII
----
- .../webservices/mediawiki/backend/mediawiki_queryrevision.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp
-index dce0fc9eb5..625d170d5e 100644
---- a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp
-+++ b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp
-@@ -299,8 +299,8 @@ void QueryRevision::doWorkProcessReply()
-                 while (count < 2)
-                 {
-                     if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++;
--                    if (replytmp[i] == QLatin1Char('<'))                          replytmp[i] = char(255);
--                    if (replytmp[i] == QLatin1Char('>'))                          replytmp[i] = char(254);
-+                    if (replytmp[i] == QLatin1Char('<'))                          replytmp[i] = QLatin1Char(char(255));
-+                    if (replytmp[i] == QLatin1Char('>'))                          replytmp[i] = QLatin1Char(char(254));
-                     ++i;
-                 }
-             }
--- 
-GitLab
-

digikam-7.2.0.tar.xz

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

digikam-7.3.0.tar.xz

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

digikam.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Mon Jul 12 19:16:48 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Update to 7.3.0
+  * https://www.digikam.org/news/2021-07-12-7.3.0_release_announcement/
+- New features (from NEWS):
+General : Add new metadata viewer based on ExifTool.
+General : Better support of astrophoto FITS image format (Flexible
+          Image Transport System) including metadata extraction
+          support to populate the database.
+General : Better support of MPO image format (Multiple Picture
+          Object) including metadata extraction support to populate
+          the database.
+General : Digital Scanner plugin is now available under Windows.
+General : Use last Exiv2 0.27.4 in all bundles with Base Media File
+          metadata read and write support (HEIF, AVIF).
+General : Use last KF5 framework 5.80 in all bundles.
+General : Update internal Libpgf to 7.21.7 (18-02-2021).
+General : Update internal Libraw from snapshot 20210622.
+General : Update internal DNG SDK to last 1.5 and XMP SDK to last
+          5.7.0.
+General : DNGWriter now use ExifTool to post-process metadata.
+General : Internal Libraw use DNG SDK 1.5 to handle 8 bits DNG
+          files.
+Searches: Find duplicates items is now process in parallel using
+          multi-cores.
+Plugins : New tool to export items to iNaturalist web service
+          (https://www.inaturalist.org/).
+Plugins : SlideShow and Presentation tools now allow to move items
+          to the trash.
+Plugins : New tool to convert RAW to DNG in batch for Showfoto.
+- 373 bugs fixed
+- Drop no longer needed upstream patch:
+  * Fix-build-after-Qt-commit-f8ad329f.patch
+- Refresh patch:
+  * 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch
+
 -------------------------------------------------------------------
 Mon Jul 12 13:49:32 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

digikam.spec

@@ -20,7 +20,7 @@
 %bcond_without lang
 %bcond_with    apidocs
 Name:           digikam
-Version:        7.2.0
+Version:        7.3.0
 Release:        0
 Summary:        A KDE Photo Manager
 License:        GPL-2.0-or-later
@@ -29,8 +29,6 @@ URL:            https://www.digikam.org/
 Source0:        https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
 # 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-build-after-Qt-commit-f8ad329f.patch
 BuildRequires:  QtAV-devel >= 1.12
 BuildRequires:  bison
 BuildRequires:  fdupes
@@ -183,7 +181,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 %{?qwebengine}