From 24ffb87d626933834027d2366bfc269ac1e232ae3649d640302afd7cbba8367b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 17 Jan 2024 21:16:35 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 219 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=506528e6b90d20322410cac7ca95507e --- ...or-each-akonadi-component-separately.patch | 8 +- 0001-Use-FindLibExiv2.cmake-from-ECM.patch | 83 ------------------- digiKam-8.1.0.tar.xz | 3 - digiKam-8.1.0.tar.xz.sig | 16 ---- digiKam-8.2.0.tar.xz | 3 + digiKam-8.2.0.tar.xz.sig | 16 ++++ digikam.changes | 9 ++ digikam.spec | 15 ++-- 8 files changed, 39 insertions(+), 114 deletions(-) delete mode 100644 0001-Use-FindLibExiv2.cmake-from-ECM.patch delete mode 100644 digiKam-8.1.0.tar.xz delete mode 100644 digiKam-8.1.0.tar.xz.sig create mode 100644 digiKam-8.2.0.tar.xz create mode 100644 digiKam-8.2.0.tar.xz.sig diff --git a/0001-Look-for-each-akonadi-component-separately.patch b/0001-Look-for-each-akonadi-component-separately.patch index 90f02ea..2a01917 100644 --- a/0001-Look-for-each-akonadi-component-separately.patch +++ b/0001-Look-for-each-akonadi-component-separately.patch @@ -15,15 +15,15 @@ index 6100334..8a18288 100644 if(ENABLE_AKONADICONTACTSUPPORT) -- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET +- find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET - OPTIONAL_COMPONENTS - Akonadi - AkonadiContact # For KDE Mail Contacts support. - Contacts # API for contacts/address book data. - ) -+ find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED) -+ find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. -+ find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data. ++ find_package(KF${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED) ++ find_package(KF${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. ++ find_package(KF${QT_VERSION_MAJOR}Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data. endif() diff --git a/0001-Use-FindLibExiv2.cmake-from-ECM.patch b/0001-Use-FindLibExiv2.cmake-from-ECM.patch deleted file mode 100644 index 77e8789..0000000 --- a/0001-Use-FindLibExiv2.cmake-from-ECM.patch +++ /dev/null @@ -1,83 +0,0 @@ -From ed7f587cf43c9f72ca89329a4a51c7e86bfa0824 Mon Sep 17 00:00:00 2001 -From: Christophe Marin -Date: Tue, 14 Nov 2023 13:31:28 +0100 -Subject: [PATCH] Use FindLibExiv2.cmake from ECM - ---- - core/CMakeLists.txt | 5 ++--- - core/app/DigikamCoreTarget.cmake | 2 +- - core/libs/metadataengine/CMakeLists.txt | 8 ++++++-- - 3 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index c694c4b..fa17f38 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -75,7 +75,8 @@ endif() - - # -- Exiv2 checks and adjustements --------------------------------------------- - --include(RulesLibExiv2) -+# include(RulesLibExiv2) -+find_package(LibExiv2 MODULE REQUIRED) - - # -- OpenCV checks and adjustements -------------------------------------------- - -@@ -255,7 +256,6 @@ PRINT_COMPONENT_COMPILE_STATUS("Media Player Support" ENAB - # ============================================================================== - - PRINT_LIBRARY_STATUS("libboostgraph" "https://github.com/boostorg/boost" "(version >= 1.43.0)" Boost_FOUND) --PRINT_LIBRARY_STATUS("libexiv2" "https://github.com/Exiv2/exiv2" "(version >= ${EXIV2_MIN_VERSION}" exiv2_FOUND) - 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://invent.kde.org/frameworks/" "(version >= ${KF5_MIN_VERSION})" KF5_FOUND) -@@ -306,7 +306,6 @@ endif() - # ============================================================================== - - if(Boost_FOUND AND -- exiv2_FOUND AND - EXPAT_FOUND AND - JPEG_FOUND AND - KF5_FOUND AND -diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake -index 83fda1b..a0fc151 100644 ---- a/core/app/DigikamCoreTarget.cmake -+++ b/core/app/DigikamCoreTarget.cmake -@@ -151,7 +151,7 @@ target_link_libraries(digikamcore - ${TIFF_LIBRARIES} - PNG::PNG - ${JPEG_LIBRARIES} -- exiv2lib -+ LibExiv2::LibExiv2 - - ${OPENMP_LDFLAGS} - -diff --git a/core/libs/metadataengine/CMakeLists.txt b/core/libs/metadataengine/CMakeLists.txt -index 47aa889..e9c01e5 100644 ---- a/core/libs/metadataengine/CMakeLists.txt -+++ b/core/libs/metadataengine/CMakeLists.txt -@@ -111,8 +111,6 @@ include_directories( - - $ - $ -- -- $ - ) - - # Used by digikamcore -@@ -123,6 +121,12 @@ target_compile_definitions(core_dmetadata_obj - digikamcore_EXPORTS - ) - -+if (LibExiv2_VERSION VERSION_LESS 0.28.0) -+ set(EXIV2_CXX_STANDARD 11) -+else() -+ set(EXIV2_CXX_STANDARD 17) -+endif() -+ - if(NOT Qt6_FOUND) - - set_target_properties(core_dmetadata_obj --- -2.42.1 - diff --git a/digiKam-8.1.0.tar.xz b/digiKam-8.1.0.tar.xz deleted file mode 100644 index 37ac93c..0000000 --- a/digiKam-8.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0503c034e445ff424f18a6715c0a7a79be4a5e0c82b3ebc461a21cec3745a5b3 -size 35712348 diff --git a/digiKam-8.1.0.tar.xz.sig b/digiKam-8.1.0.tar.xz.sig deleted file mode 100644 index af17fc6..0000000 --- a/digiKam-8.1.0.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------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----- diff --git a/digiKam-8.2.0.tar.xz b/digiKam-8.2.0.tar.xz new file mode 100644 index 0000000..9b184ff --- /dev/null +++ b/digiKam-8.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf +size 48172600 diff --git a/digiKam-8.2.0.tar.xz.sig b/digiKam-8.2.0.tar.xz.sig new file mode 100644 index 0000000..56c3729 --- /dev/null +++ b/digiKam-8.2.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmVnoy8ACgkQSnd0e8I4 +blCfVQ/+KasLBXGBrCovoguW6P7p1gA2AacEzwMhQDn2YgoJpLkOwcw19g9kI5lG +cEpQ+l1yXb9Xo+6V0Ggg4BqYnGG1mxCKOGUqJ8duLA8mecmoETSy1X2+hatuSUOg +/UjX9ZgCkBpChnUm7oIZ+y+atR1VSNm51JVO401IpAaLY4R4B7UyLih4OwuUcpHb +jroWq/a8wdupHqc6j6tBTXIW9wqsq3V8ye51GulaAqI68P6gX3Ga+tBd0qTc/xS5 +MNDZOVDUva2Hlm7yQPGXcvk5gX98HJo4V/bybPikzkGoUWw7oc9VIp744LHTYeri +X9pNjoljzJEgz09X1q26CsKfLUyhd5Ymn+oT0YaaXjomD+2f7a5StML8VKN/KfPt +WdCFxHV4Wgh+17fOQuer8enklxETdPtFBQFbCkxltDjJ+nVLJJHGIl7P0Taxm/92 +VtJbLqjVC9Yz8vNP0jZr6Zy4fuHijRWb2P9zFu1cFb6E+99o7Ls1ipGCb+Nep5Ht +LiZqOHk50Htf5l94OKwfLgMRQ1tayyNyjK1K2E3wCIupqlllEtx1E29jSuwn+V2w +1wtWqWDW/5npQTIjAx+yaCTXeeGE9IvbwM/SZZmqZ3zlOAdBjnd2zwyyAdf1Qr9h +XxT7OOX+ufLvgmw7+XezUStefBMESoQUZCPSmr3Xgj9k6FmS31w= +=MJW3 +-----END PGP SIGNATURE----- diff --git a/digikam.changes b/digikam.changes index f09ea82..3640aa2 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 15 14:52:32 UTC 2024 - Wolfgang Bauer + +- Update to 8.2.0: + https://www.digikam.org/news/2023-12-03-8.2.0_release_announcement/ +- Drop 0001-Use-FindLibExiv2.cmake-from-ECM.patch, no longer + necessary +- Rebase 0001-Look-for-each-akonadi-component-separately.patch + ------------------------------------------------------------------- Fri Dec 15 22:02:40 UTC 2023 - Christophe Marin diff --git a/digikam.spec b/digikam.spec index f99ee0d..f61706e 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define soversion 8_1_0 +%define soversion 8_2_0 %bcond_without released %bcond_with apidocs Name: digikam -Version: 8.1.0 +Version: 8.2.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0-or-later @@ -32,8 +32,6 @@ Source2: %{name}.keyring %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Look-for-each-akonadi-component-separately.patch -# PATCH-FIX-UPSTREAM fixed differently upstream -Patch1: 0001-Use-FindLibExiv2.cmake-from-ECM.patch # QtWebEngine is not available on ppc and zSystems ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{riscv} BuildRequires: QtAV-devel >= 1.12 @@ -51,7 +49,7 @@ BuildRequires: libeigen3-devel BuildRequires: libexiv2-devel >= 0.27.1 BuildRequires: liblqr-devel BuildRequires: libtiff-devel -BuildRequires: opencv-devel >= 3.3.0 +BuildRequires: opencv-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files %if %{with apidocs} @@ -94,6 +92,7 @@ BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: cmake(libheif) BuildRequires: pkgconfig(Magick++) BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(jasper) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lensfun) BuildRequires: pkgconfig(libavcodec) @@ -174,11 +173,11 @@ The main digikam libraries that are being shared between showfoto and digikam %if %{pkg_vcmp akonadi-contact-devel >= 23.03.80} # Digikam doesn't look explicitly for akonadi-server but relies on AkonadiContact dependencies -sed -i 's#KF5::AkonadiCore#KPim5::AkonadiCore#' core/utilities/extrasupport/addressbook/CMakeLists.txt +sed -i 's#KF${QT_VERSION_MAJOR}::AkonadiCore#KPim${QT_VERSION_MAJOR}::AkonadiCore#' core/utilities/extrasupport/addressbook/CMakeLists.txt %endif # Compatibility CMake files were removed in PIM packages after 23.08.0 %if %{pkg_vcmp akonadi-contact-devel >= 23.08.0} -sed -i 's#KF5\([:]*Akonadi\)#KPim5\1#' core/{CMakeLists.txt,utilities/extrasupport/{addressbook/,}CMakeLists.txt,app/DigikamCoreTarget.cmake,cmake/rules/RulesKDEFramework.cmake} +sed -i 's#KF${QT_VERSION_MAJOR}\([:]*Akonadi\)#KPim${QT_VERSION_MAJOR}\1#' core/{CMakeLists.txt,utilities/extrasupport/{addressbook/,}CMakeLists.txt,app/DigikamCoreTarget.cmake,cmake/rules/RulesKDEFramework.cmake} %endif %build