From 3ec957cb8fb56ef6c2106b9dcef54714670c0a11 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 11 2018 03:43:46 +0000 Subject: 5.8.0 --- diff --git a/.gitignore b/.gitignore index 836072f..e93f5ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/digikam-5.6.0.tar.xz -/digikam-5.7.0.tar.xz -/0308-update-internal-liraw-to-last-stable-0.18.4-https-ww.patch -/0361-update-internal-libraw-to-last-0.18.5-https-www.libr.patch -/0539-update-internal-libraw-to-last-0.18.6.patch +/digikam-5.8.0.tar.xz diff --git a/0207-calendar-Adjust-to-new-KCalCore-API-fixes-CI.patch b/0207-calendar-Adjust-to-new-KCalCore-API-fixes-CI.patch deleted file mode 100644 index b56fcb0..0000000 --- a/0207-calendar-Adjust-to-new-KCalCore-API-fixes-CI.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001 -From: Simon Frei -Date: Wed, 13 Sep 2017 15:43:49 +0200 -Subject: [PATCH 207/489] calendar: Adjust to new KCalCore API (fixes CI) - ---- - utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp -index b0bed5aa7f..46e995de72 100644 ---- a/utilities/assistants/calendar/print/calsettings.cpp -+++ b/utilities/assistants/calendar/print/calsettings.cpp -@@ -31,12 +31,17 @@ - #include "digikam_debug.h" - #include "calsystem.h" - --// KCalCore includes - - #ifdef HAVE_KCALENDAR -+ // KCalCore includes -+ - # include - # include - # include -+ -+ // Qt includes -+ -+# include - #endif // HAVE_KCALENDAR - - namespace Digikam -@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color) - return; - } - -- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC"))); -+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0))); - KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat)); - - qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile(); --- -2.14.3 - diff --git a/0211-Adapt-to-KCalCore-API-changes.patch b/0211-Adapt-to-KCalCore-API-changes.patch deleted file mode 100644 index 6393c87..0000000 --- a/0211-Adapt-to-KCalCore-API-changes.patch +++ /dev/null @@ -1,77 +0,0 @@ -From dad750fadc926b62603cc9d64009ee5072a46d97 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Wed, 13 Sep 2017 16:51:14 +0200 -Subject: [PATCH 211/489] Adapt to KCalCore API changes - -This change supports both old (pre-QDateTime) and new version. - -Differential Revision: https://phabricator.kde.org/D7802 ---- - CMakeLists.txt | 3 +++ - app/utils/digikam_config.h.cmake.in | 3 +++ - utilities/assistants/calendar/print/calsettings.cpp | 14 ++++++++++---- - 3 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ad686d8ce..e2f28a7aec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -174,6 +174,9 @@ find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET - OPTIONAL_COMPONENTS - CalendarCore # For Calendar tool. - ) -+if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) -+ set(HAVE_KCALENDAR_QDATETIME TRUE) -+endif() - - if(ENABLE_AKONADICONTACTSUPPORT AND NOT KF5AkonadiContact_FOUND) - set(ENABLE_KFILEMETADATASUPPORT OFF) -diff --git a/app/utils/digikam_config.h.cmake.in b/app/utils/digikam_config.h.cmake.in -index 8a2e8e5feb..ffd3a22717 100644 ---- a/app/utils/digikam_config.h.cmake.in -+++ b/app/utils/digikam_config.h.cmake.in -@@ -75,6 +75,9 @@ - /* Define to 1 if you have KCalendar core shared libraries installed */ - #cmakedefine HAVE_KCALENDAR 1 - -+/* Define to 1 if you have KCalendar core shared libraries with QDateTime support installed */ -+#cmakedefine HAVE_KCALENDAR_QDATETIME 1 -+ - /* Define to 1 if Panorama tool is supported */ - #cmakedefine HAVE_PANORAMA 1 - -diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp -index 46e995de72..c6554efd98 100644 ---- a/utilities/assistants/calendar/print/calsettings.cpp -+++ b/utilities/assistants/calendar/print/calsettings.cpp -@@ -295,7 +295,13 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color) - return; - } - -- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0))); -+#if HAVE_KCALENDAR_QDATETIME -+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone::utc())); -+ using DateTime = QDateTime; -+#else -+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC"))); -+ using DateTime = KDateTime; -+#endif - KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat)); - - qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile(); -@@ -313,9 +319,9 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color) - qLast = calSys.date(params.year + 1, 1, 1); - qLast = qLast.addDays(-1); - -- KDateTime dtFirst(qFirst); -- KDateTime dtLast(qLast); -- KDateTime dtCurrent; -+ DateTime dtFirst(qFirst, QTime(0, 0)); -+ DateTime dtLast(qLast, QTime(0, 0)); -+ DateTime dtCurrent; - - int counter = 0; - KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast); --- -2.14.3 - diff --git a/0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch b/0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch deleted file mode 100644 index 7399a55..0000000 --- a/0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001 -From: Maik Qualmann -Date: Tue, 28 Nov 2017 21:29:00 +0100 -Subject: [PATCH 489/489] try to fix the Qt-5.9.3 empty album problem CCBUGS: - 387373 - ---- - libs/database/coredb/coredburl.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp -index 2c0d0ebfdb..b1bdf7187b 100644 ---- a/libs/database/coredb/coredburl.cpp -+++ b/libs/database/coredb/coredburl.cpp -@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name, - const DbEngineParameters& parameters) - { - CoreDbUrl url; -+ QString path(album); - url.setScheme(QLatin1String("digikamalbums")); -- url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name); -+ -+ if (path != QLatin1Char('/')) -+ path += QLatin1Char('/'); -+ -+ url.setPath(path + name); - - QUrlQuery q(url); - q.addQueryItem(QLatin1String("albumRoot"), albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile()); --- -2.14.3 - diff --git a/digikam.spec b/digikam.spec index 023e4e0..d447f4a 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ Name: digikam Summary: A digital camera accessing & photo management application -Version: 5.7.0 -Release: 7%{?dist} +Version: 5.8.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -13,12 +13,6 @@ Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{? Source10: digikam-import.desktop ## upstream patches -Patch207: 0207-calendar-Adjust-to-new-KCalCore-API-fixes-CI.patch -Patch211: 0211-Adapt-to-KCalCore-API-changes.patch -Patch308: 0308-update-internal-liraw-to-last-stable-0.18.4-https-ww.patch -Patch361: 0361-update-internal-libraw-to-last-0.18.5-https-www.libr.patch -Patch489: 0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch -Patch539: 0539-update-internal-libraw-to-last-0.18.6.patch ## upstreamable patches # doc-translated FTBFS, https://bugs.kde.org/show_bug.cgi?id=377597 @@ -183,15 +177,6 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} -pushd core -%patch207 -p1 -%patch211 -p1 -%patch308 -p1 -%patch361 -p1 -%patch489 -p1 -b .0489 -%patch539 -p1 -popd - %patch100 -p1 -b .doc_translated %patch101 -p1 -b .glibc_powf64 @@ -254,7 +239,7 @@ update-desktop-database -q &> /dev/null %files -f digikam.lang %doc core/AUTHORS core/ChangeLog -%doc core/NEWS core/README core/TODO +%doc core/NEWS core/README.md core/TODO %license core/COPYING %{_kf5_bindir}/digikam %{_kf5_bindir}/digitaglinktree @@ -327,6 +312,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Wed Jan 10 2018 Rex Dieter - 5.8.0-1 +- 5.8.0 + * Mon Jan 08 2018 Sérgio Basto - 5.7.0-7 - Rebuild (opencv-3.3.1) diff --git a/sources b/sources index cd36232..31b8194 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (digikam-5.7.0.tar.xz) = 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 -SHA512 (0308-update-internal-liraw-to-last-stable-0.18.4-https-ww.patch) = 57fb7cd5be1af1bbdb7dec88f79bd2036b3829c18def1ad8995c7a1f9039624982fe367a628188dd080489a6664539a8e42cb54cb886721ac8218b78a4615c86 -SHA512 (0361-update-internal-libraw-to-last-0.18.5-https-www.libr.patch) = 181bec9000b383e980a653a705d4df0a76b7737cdbed92d96d00f29aeb04a8d07e1ca4c3ed4f5c5307754f4c22a29767f78f7a42314ce18bea6e1da9e9edeef0 -SHA512 (0539-update-internal-libraw-to-last-0.18.6.patch) = 7ab37aa6d10f9626e55077a112bfbd1adf7d4a9dc0eb292190832ff308af46a4db2bcae5490cab84af1cd7861869adf0475e124289b9fa6ab64a117d73e052cd +SHA512 (digikam-5.8.0.tar.xz) = f4b33fce0d5ef1e7032d3bb023b3037327c105fb3dd25f9a84f432e28b3a92c9904bbc33bba2066d766ea02721d5634dc643d7cc0c990ccf2285a0c697278b6c