Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2023-03-28 17:51:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Tue Mar 28 17:51:07 2023 rev:210 rq:1074923 version:7.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2022-12-09 13:19:06.639425467 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new.31432/digikam.changes 2023-03-28 17:51:14.071515982 +0200 @@ -1,0 +2,14 @@ +Tue Mar 28 08:43:33 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Add upstream change: + * 0001-fix-compile-DNG-SDK-with-GCC13.patch + +------------------------------------------------------------------- +Mon Mar 20 15:39:39 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 7.10.0: + * https://www.digikam.org/news/2023-03-13-7.10.0_release_announcement/ +- Drop patch, no longer needed: + * 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch + +------------------------------------------------------------------- Old: ---- 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch digiKam-7.9.0.tar.xz digiKam-7.9.0.tar.xz.sig New: ---- 0001-fix-compile-DNG-SDK-with-GCC13.patch digiKam-7.10.0.tar.xz digiKam-7.10.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.s2yOiL/_old 2023-03-28 17:51:17.735533660 +0200 +++ /var/tmp/diff_new_pack.s2yOiL/_new 2023-03-28 17:51:17.739533680 +0200 @@ -16,45 +16,36 @@ # -%define soversion 7_9_0 +%define soversion 7_10_0 %bcond_without released %bcond_with apidocs Name: digikam -Version: 7.9.0 +Version: 7.10.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}/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 +Patch0: 0001-fix-compile-DNG-SDK-with-GCC13.patch # QtWebEngine is not available on ppc and zSystems -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{mips} %{riscv} +ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{riscv} BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: hicolor-icon-theme BuildRequires: lensfun -BuildRequires: lensfun-devel 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: libexiv2-devel >= 0.27.1 BuildRequires: liblqr-devel -BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: opencv-devel >= 3.4.0 +BuildRequires: opencv-devel >= 3.3.0 BuildRequires: pkgconfig BuildRequires: update-desktop-files %if %{with apidocs} @@ -65,6 +56,7 @@ BuildRequires: cmake(KF5AkonadiContact) BuildRequires: cmake(KF5CalendarCore) BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5FileMetaData) BuildRequires: cmake(KF5I18n) @@ -75,15 +67,16 @@ BuildRequires: cmake(KF5Sane) BuildRequires: cmake(KF5Service) BuildRequires: cmake(KF5Solid) -BuildRequires: cmake(KF5ThreadWeaver) >= 5.5.0 +BuildRequires: cmake(KF5ThreadWeaver) BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5XmlGui) BuildRequires: cmake(Marble) BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) >= 5.9.0 +BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5NetworkAuth) BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Sql) @@ -94,21 +87,30 @@ BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: cmake(libheif) BuildRequires: pkgconfig(Magick++) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(lensfun) +BuildRequires: pkgconfig(libgphoto2) >= 2.4.0 +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(zlib) %if 0%{suse_version} >= 1550 BuildRequires: ffmpeg-4-libavcodec-devel BuildRequires: ffmpeg-4-libavdevice-devel BuildRequires: ffmpeg-4-libavfilter-devel BuildRequires: ffmpeg-4-libavformat-devel BuildRequires: ffmpeg-4-libavutil-devel +BuildRequires: ffmpeg-4-libswscale-devel %else BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) -%endif -BuildRequires: pkgconfig(libgphoto2) >= 2.4.0 BuildRequires: pkgconfig(libswscale) +%endif Requires: %{name}-plugins Requires: libQt5Sql5-sqlite Recommends: marble @@ -139,7 +141,6 @@ %package plugins Summary: DigiKam plugins -Group: Productivity/Graphics/Viewers Recommends: enblend-enfuse Recommends: hugin @@ -148,7 +149,6 @@ %package devel Summary: DigiKam development files -Group: Development/Libraries/KDE Requires: libdigikamcore%{soversion} = %{version} %description devel @@ -156,7 +156,6 @@ %package -n showfoto Summary: DigiKam: Showfoto -Group: Productivity/Graphics/Viewers Supplements: %{name} %description -n showfoto @@ -164,7 +163,6 @@ %package -n libdigikamcore%{soversion} Summary: The main digikam libraries -Group: Development/Libraries/KDE Recommends: %{name}-plugins %description -n libdigikamcore%{soversion} @@ -173,10 +171,11 @@ %lang_package %prep -%setup -q -%if 0%{?suse_version} <= 1500 -# Leap 15 only has exiv2 0.26 -%patch0 -p1 +%autosetup -p1 + +%if %{pkg_vcmp cmake(KF5AkonadiContact) >= 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 %endif %build @@ -195,14 +194,11 @@ %suse_update_desktop_file -r org.kde.showfoto Qt KDE Graphics Photography %endif -%if %{with released} %find_lang %{name} --without-kde -%endif %fdupes %{buildroot} -%post -n libdigikamcore%{soversion} -p /sbin/ldconfig -%postun -n libdigikamcore%{soversion} -p /sbin/ldconfig +%ldconfig_scriptlets -n libdigikamcore%{soversion} %files %{_kf5_bindir}/digikam @@ -248,12 +244,10 @@ %files -n libdigikamcore%{soversion} %license COPYING* -%{_kf5_libdir}/libdigikamcore.so.7.9.0 -%{_kf5_libdir}/libdigikamdatabase.so.7.9.0 -%{_kf5_libdir}/libdigikamgui.so.7.9.0 +%{_kf5_libdir}/libdigikamcore.so.7.10.0 +%{_kf5_libdir}/libdigikamdatabase.so.7.10.0 +%{_kf5_libdir}/libdigikamgui.so.7.10.0 -%if %{with released} %files lang -f %{name}.lang -%endif %changelog ++++++ 0001-fix-compile-DNG-SDK-with-GCC13.patch ++++++ >From f7bad0e9c979a5d700aababa37eac3633d52816b Mon Sep 17 00:00:00 2001 From: Maik Qualmann <metzping...@gmail.com> Date: Sun, 26 Mar 2023 13:19:40 +0200 Subject: [PATCH] fix compile DNG-SDK with GCC13 --- core/libs/dngwriter/extra/dng_sdk/dng_string.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp index fa58711..dbd7e17 100644 --- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp +++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp @@ -23,7 +23,7 @@ #include <windows.h> #endif -#if qiPhone || qAndroid +#if qLinux || qiPhone || qAndroid #include <ctype.h> // for isdigit #endif -- 2.40.0 ++++++ digiKam-7.9.0.tar.xz -> digiKam-7.10.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/digikam/digiKam-7.9.0.tar.xz /work/SRC/openSUSE:Factory/.digikam.new.31432/digiKam-7.10.0.tar.xz differ: char 27, line 1
