From 334eec73f9420b2d35035aa4a7b717a82b2ef621e87cfb7ace7771a01454e27e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 1 Aug 2022 19:33:23 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 206.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=837ce6a14a691a280b320a49e2b2b30b --- ...now-released-with-exported-targets-u.patch | 14 ++++------ Fix-build-with-akonadi-contacts-22.04.patch | 28 ------------------- digiKam-7.6.0.tar.xz | 3 -- digiKam-7.6.0.tar.xz.sig | 16 ----------- digiKam-7.7.0.tar.xz | 3 ++ digiKam-7.7.0.tar.xz.sig | 16 +++++++++++ digikam.changes | 18 ++++++++++++ digikam.spec | 23 +++++++-------- 8 files changed, 53 insertions(+), 68 deletions(-) delete mode 100644 Fix-build-with-akonadi-contacts-22.04.patch delete mode 100644 digiKam-7.6.0.tar.xz delete mode 100644 digiKam-7.6.0.tar.xz.sig create mode 100644 digiKam-7.7.0.tar.xz create mode 100644 digiKam-7.7.0.tar.xz.sig diff --git a/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch b/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch index 50fcdef..138c38a 100644 --- a/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch +++ b/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch @@ -33,18 +33,16 @@ index 16bba83335..174dc3c683 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,19 +180,15 @@ if(NOT X265_FOUND) - set(X265_LIBRARIES "") +@@ -188,7 +188,7 @@ + endif() -find_package(exiv2 REQUIRED) +find_package(Exiv2 ${EXIV2_MIN_VERSION} REQUIRED) --set_package_properties("exiv2" PROPERTIES -+set_package_properties("Exiv2" PROPERTIES + set_package_properties("exiv2" PROPERTIES DESCRIPTION "Required to build digiKam" - URL "https://www.exiv2.org" - TYPE RECOMMENDED +@@ -197,10 +197,6 @@ PURPOSE "Library to manage image metadata" ) @@ -232,8 +230,8 @@ index 9e3a026035..596c701516 100644 DISABLE_GCC_COMPILER_WARNINGS("5.99.99" "-Wno-deprecated") -@@ -90,14 +89,13 @@ set(libdmetadata_SRCS - ) +@@ -99,14 +99,13 @@ + endif() include_directories( + ${EXIV2_INCLUDE_DIR} diff --git a/Fix-build-with-akonadi-contacts-22.04.patch b/Fix-build-with-akonadi-contacts-22.04.patch deleted file mode 100644 index cc12f95..0000000 --- a/Fix-build-with-akonadi-contacts-22.04.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Fri, 22 Apr 2022 19:13:28 +0200 -Subject: [PATCH] Fix build with akonadi-contacts 22.04 - ---- - core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp -index 6a78863cf6..8e65a405da 100644 ---- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp -+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp -@@ -49,7 +49,11 @@ - #include - #endif - -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80) -+#include -+#else - #include -+#endif - #include - - #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG) --- -GitLab - diff --git a/digiKam-7.6.0.tar.xz b/digiKam-7.6.0.tar.xz deleted file mode 100644 index fc5b6e3..0000000 --- a/digiKam-7.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641 -size 339519260 diff --git a/digiKam-7.6.0.tar.xz.sig b/digiKam-7.6.0.tar.xz.sig deleted file mode 100644 index 1748fd7..0000000 --- a/digiKam-7.6.0.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmIeYdsACgkQSnd0e8I4 -blBNCA//akQoaz/1dgSTjAJIxRo3iPRnZiUQs3LajpXfw781mmb/onL7zYWSsiwQ -ktckmcACq5TggzLSFifeUWEV1NdgXY5CB2/Eq6QEThZGm6cIOOF5j5cfGHGo2o4q -xG6cjZYmbvCxKRmNFFzyQgb0jrGIATYdH3bzX+w6R9hhyXkz7uZESBSvZcsE2JKB -OCqHcXIxIanm3GEwZXEDWSzJ1cItPOoeXpNnK9Ok0Mz11384TRi8jHdT0A2JoX3i -PGs7KROB2DZDHsW6btgVrodMhq53E9Pdk8gRqhYMG1yaAwnWivBF3DR8FztitYCM -T/OSkP/a1Fon8nqsZb+8efIeJk6Nw+gilRM6PRcgXFu60AFqfKHGxHumkvnggp/c -PFB7nKXXUwaC5RpokmcgdADLx71p6vM0weSixsM1WIDOlBP7ivS3eXyLDe0DGIer -bbsBKY3LKwIS5yeX1cduaesnbf6bJ8f3lyecdg64FbfliwQ4qdOvYMfNWe2JncXp -cfwd9Jvmk2/3yrFX9wpm2pjCZpnmaxZiJvfGWvVMH70gzRdzc7URNdgHjjqd4AzX -FPbUI86iN7Kmm3VQG5OgUM8NgRlgiyzN/uipLVgVMBtfLBX23YwzfbEF8u0r9tfJ -nDx9lsjvEafANJruHiXBaLvG/S3vT2mzbeV1DOX7yKKiPiJzvLw= -=087B ------END PGP SIGNATURE----- diff --git a/digiKam-7.7.0.tar.xz b/digiKam-7.7.0.tar.xz new file mode 100644 index 0000000..019dff0 --- /dev/null +++ b/digiKam-7.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0c6dd2ea8a07514acbf2462f3a54518e7e8099b3337f881336168cff63d771c +size 351915336 diff --git a/digiKam-7.7.0.tar.xz.sig b/digiKam-7.7.0.tar.xz.sig new file mode 100644 index 0000000..079d779 --- /dev/null +++ b/digiKam-7.7.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmKzCQoACgkQSnd0e8I4 +blBqdRAAkuf+1hSCN3yAgLnqTW/Zd/FdgzDWN+oC7gy8Wgy8B96tKu9FnpWil51l +wb+A/QJW9tDMH917Ri5b0/PYXwvGbxM8+1MG/vgsZZ/Q1klGYeeIiD8FB+jgcQOD +G9l35j/bjTwc0+ZpFKaJqvfdalZ3qoYZ71peRLI7OuCGfklWL/S2ZxmCLBejJA+8 +Yfer1LRg6DAgd75N2uIrS7NKael02TcCiqjXFczVL6lRXTgxNB96GOr6MCThmueP +MdSQO+UGZ+9nOnlatCO6FnuSsljkerdohAH9XZHWCWSSKK63LX/ehW5W9mhkRf3l +m8ikfp6aOjuZGsDBF1eCkJOfTCfhNuCLHQABaQMpKZj21Bo+381N9gkH9rLchXZ+ +rXbyMSIUZ2hZ5PCoDRnWf0nsCrVtmulnN4Leyl6apakSnRPSxolixZvmT+rGc6Af +0qDyENEr5MOO0+v8n6QmwAaCws763DonJoHPWI8cGOMcHtL/K/54SFVZIdy3B4N0 +j7NW7XgqA+94wv/SzZSYJ/uN3r5/al0Jh5fJGIswvmCGUXYlh9R9oHOhkH+f+kxU +BF3p5qGhBeaqb9M9fJk+Xhn6rMa0UTU9jQAH5j0WlsTv1/JQdZjwYxCBHM8L/pOA +HiC2HAJDVW3ZdVHM773eZ9MW9BIlAzpYQi1ZnCmJX3yLv7SORng= +=exiN +-----END PGP SIGNATURE----- diff --git a/digikam.changes b/digikam.changes index a4da6e2..2a42fd2 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Aug 1 11:03:57 UTC 2022 - Cor Blom + +- Updated 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch + +------------------------------------------------------------------- +Sat Jul 30 09:53:33 UTC 2022 - Cor Blom + +- Update to 7.7.0 + * https://www.digikam.org/news/2022-06-26-7.7.0_release_announcement/ +- New features (from NEWS): + * Remove internal libheif and libde265 from core in favor to + system libraries. + * Update internal Libraw snashot to 2022-06-17 with Olympus OM-1 + support. +- 81 bugs fixed +- Removed now included Fix-build-with-akonadi-contacts-22.04.patch + ------------------------------------------------------------------- Wed May 25 11:04:34 UTC 2022 - Jan Engelhardt diff --git a/digikam.spec b/digikam.spec index eea32ab..c106e38 100644 --- a/digikam.spec +++ b/digikam.spec @@ -19,7 +19,7 @@ %bcond_without released %bcond_with apidocs Name: digikam -Version: 7.6.0 +Version: 7.7.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 -- 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-with-akonadi-contacts-22.04.patch # QtWebEngine is not available on ppc and zSystems ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{mips} %{riscv} BuildRequires: QtAV-devel >= 1.12 @@ -141,7 +139,7 @@ Additional plugins for digiKam. %package devel Summary: DigiKam development files Group: Development/Libraries/KDE -Requires: libdigikamcore7_6_0 = %{version} +Requires: libdigikamcore7_7_0 = %{version} %description devel Development headers and libraries for digiKam. @@ -154,7 +152,7 @@ Supplements: %{name} %description -n showfoto Additional program to browse and view photos -%package -n libdigikamcore7_6_0 +%package -n libdigikamcore7_7_0 Summary: The main digikam libraries Group: Development/Libraries/KDE Conflicts: libdigikamcore7 @@ -162,7 +160,7 @@ Conflicts: libdigikamcore7 %requires_eq %(rpm --qf %%{name} -qf %{_libdir}/libopencv_dnn.so.%{pkg_version opencv-devel}) Recommends: %{name}-plugins -%description -n libdigikamcore7_6_0 +%description -n libdigikamcore7_7_0 The main digikam libraries that are being shared between showfoto and digikam %lang_package @@ -173,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 @@ -197,8 +194,8 @@ The main digikam libraries that are being shared between showfoto and digikam %fdupes %{buildroot} -%post -n libdigikamcore7_6_0 -p /sbin/ldconfig -%postun -n libdigikamcore7_6_0 -p /sbin/ldconfig +%post -n libdigikamcore7_7_0 -p /sbin/ldconfig +%postun -n libdigikamcore7_7_0 -p /sbin/ldconfig %files %{_kf5_bindir}/digikam @@ -242,11 +239,11 @@ The main digikam libraries that are being shared between showfoto and digikam %{_kf5_kxmlguidir}/showfoto/ %{_kf5_appstreamdir}/org.kde.showfoto.appdata.xml -%files -n libdigikamcore7_6_0 +%files -n libdigikamcore7_7_0 %license COPYING* -%{_kf5_libdir}/libdigikamcore.so.7.6.0 -%{_kf5_libdir}/libdigikamdatabase.so.7.6.0 -%{_kf5_libdir}/libdigikamgui.so.7.6.0 +%{_kf5_libdir}/libdigikamcore.so.7.7.0 +%{_kf5_libdir}/libdigikamdatabase.so.7.7.0 +%{_kf5_libdir}/libdigikamgui.so.7.7.0 %if %{with released} %files lang -f %{name}.lang