diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
commit | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (patch) | |
tree | f88035a58c20099cf45a576fb53b0330a4754f14 /media-gfx/digikam | |
parent | 0fb71e0215ed52863e462cccef73c01aff44d43d (diff) |
gentoo resync : 20.12.2017
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r-- | media-gfx/digikam/Manifest | 6 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-5.7.0-r1.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-5.7.0-r3.ebuild (renamed from media-gfx/digikam/digikam-5.7.0-r2.ebuild) | 1 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch | 44 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch | 79 |
5 files changed, 129 insertions, 3 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index e2a17951876d..65909b3c01c9 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,9 +1,11 @@ AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19 +AUX digikam-5.7.0-kcalcore-1.patch 1489 BLAKE2B af340a573d5cff28ef6d7fe91564ff858d3f55d0a641e05cbaf2428b3bd6351f04fd09a69bfa27d1b6e17e6ba2576571914923ceef84c4920e549d254af03886 SHA512 da3b1bd9586757174333fcfba927ef6d91e0b45813eaf5e9cde5d1062f1154fc6449b1fb746dbac2ddc05ba5c92ca162198fb6a4e36789786d81179c56770e29 +AUX digikam-5.7.0-kcalcore-2.patch 3221 BLAKE2B 6bd179c65797444a4ddbc133c9a1e3204b8127acd360bdb18a766ecaecc0d8efd5284686c424379c8a80010135f0f1653c4efacd83500018da9724bcce1f1db3 SHA512 1f3b9434a53ac0d6111c8b3c306b30515684ab09eca2f8794cdcf21639af6e8148da881c4fb0fcf5aacb4531be35c1ecf51ee2ee7bb6fde9013736e04ec0f66d AUX digikam-5.7.0-kreadconfig5.patch 1068 BLAKE2B 4a19e8c0806e7d4ba6219711385db7865507414203f4a273114e1ece3e62983f36cac3b299c3d498a6118dd608719d18ad1c29d1d66bf4774151f530fcb08e01 SHA512 cc78a318f865a85c5a1b0a89734c6c320367c961313db1f8acac25a340c481aa79154ae0c21683f967e0042008235ccf5c9a28078d359c07aaa3e4244b543871 AUX digikam-5.7.0-mariadb-10.2-1.patch 1949 BLAKE2B 5af708e8e6296031752acdb579cc20a502968deb791a1bcc305fe2fef72dd67ff8b7d78bc85a6311a301428167d985f1ccb67b322e80b61c2b22e9909d7324c2 SHA512 13b83b1b32d33955f140345a47dda2d8ef0eb9057e154962f382b415e0bc46ca34ccc9b2fa782b4660eb05c947c8555fae6f9e6828a904c41d66e9a032399f82 AUX digikam-5.7.0-mariadb-10.2-2.patch 3714 BLAKE2B b08c0544def660bfef87c68204bf00dff2661d58877f514fbfbe6bb8c856cfcb72acc10c2f8661a19230b2a4ec92407c401b90af8482ff97fbcce87bd8c7e6d1 SHA512 c7865329b6387f5c4decfa750f3bfeba3d3b61df5c86b35147050d5fbf4c3585cb8ed5e8789b6dcab6f1887dc4322200920b432006d80457edf286cad594ef51 AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61 DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 -EBUILD digikam-5.7.0-r1.ebuild 4853 BLAKE2B 45d3b347df857eaf876f72b051aea5a331051853120f9ade856a64fe29e292b7cdca16b2693e490e1551b2ae7e0afddc86c741f6b959bb9b3030c1d13a3cd5f7 SHA512 7f4ec195506d628096c7dcb7428f21e1ef0294b7c6b0b9f1865b18d874579ae7d600efa867afc8022e4384f2147b802bb4a6c856842994bd4e7bb53247de0e54 -EBUILD digikam-5.7.0-r2.ebuild 4940 BLAKE2B 7a2ab69cadaf4183411df54924883c8401910b2ebf4825c07f1a73b8f98bdebd780da17d6da52074c1e19bf1dab71311d2a736617f284750428c8d78e0cac55e SHA512 81cba5421883f2f3ceffc0af3b0bb00cbff54f5ebfc2ee01833b10bf522b99f5088d25ce80cbb3698e574ea6bea90ad6e39ec9e9d1f1e11fabdf2a5131a0478c +EBUILD digikam-5.7.0-r1.ebuild 4855 BLAKE2B 0f5e691cc41edcf6d31ec61e63e258186ff848229cf1a723a0adfd0dfed92a9523028dbdfd92a0118b34d494a16121d988071b75ba3ad03d38eb10275f3c9b41 SHA512 2b9fa5d31467d7a15c56b60f27c38744aaa1fb008f02c6541a8bff6029eb2ace5e125e588a6ad56dffc0d725985c0a67a5e1df9ebe187fea5ae6613ca57e3ba9 +EBUILD digikam-5.7.0-r3.ebuild 4981 BLAKE2B 1db2aaaf8793a6cd11973085876d5988edebb789d5256df834c5e33ac54c81daf98c44c49c5ce05b55dd5d64b149495c10969eb707f872b6c1bd07dd7655d6ce SHA512 cc986781eb5faca4ea8247a0840cc00ab7445f05043712425eb16b1e3d924c24fb196a3100ab69c803b9e2bb5ff3e8eb7386f2058db6498f36f4529a0d7b986a MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild index bb175b60e38c..71d112cc5d80 100644 --- a/media-gfx/digikam/digikam-5.7.0-r1.ebuild +++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild @@ -63,7 +63,7 @@ COMMON_DEPEND=" $(add_kdeapps_dep akonadi-contacts) $(add_kdeapps_dep kcontacts) ) - calendar? ( $(add_kdeapps_dep kcalcore) ) + calendar? ( <kde-apps/kcalcore-17.11.80:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') ) diff --git a/media-gfx/digikam/digikam-5.7.0-r2.ebuild b/media-gfx/digikam/digikam-5.7.0-r3.ebuild index 0b1c44fc5b4b..bedb0c1673db 100644 --- a/media-gfx/digikam/digikam-5.7.0-r2.ebuild +++ b/media-gfx/digikam/digikam-5.7.0-r3.ebuild @@ -110,6 +110,7 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.9.3.patch "${FILESDIR}"/${P}-mariadb-10.2-{1,2}.patch "${FILESDIR}"/${P}-kreadconfig5.patch + "${FILESDIR}"/${P}-kcalcore-{1,2}.patch ) pkg_pretend() { diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch new file mode 100644 index 000000000000..9a9574fc982b --- /dev/null +++ b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch @@ -0,0 +1,44 @@ +From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001 +From: Simon Frei <freisim93@gmail.com> +Date: Wed, 13 Sep 2017 15:43:49 +0200 +Subject: 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 b0bed5a..46e995d 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 <kcalcore/icalformat.h> + # include <kcalcore/filestorage.h> + # include <kcalcore/memorycalendar.h> ++ ++ // Qt includes ++ ++# include <QTimeZone> + #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(); +-- +cgit v0.11.2 + diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch new file mode 100644 index 000000000000..7237b74a285f --- /dev/null +++ b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch @@ -0,0 +1,79 @@ +From dad750fadc926b62603cc9d64009ee5072a46d97 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org> +Date: Wed, 13 Sep 2017 16:51:14 +0200 +Subject: Adapt to KCalCore API changes + +This change supports both old (pre-QDateTime) and new version. + +Differential Revision: https://phabricator.kde.org/D7802 + +* asturm: Incorporated fix from d204022e191d9377874689bfe4c89f7b83998188 +--- + 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 3ad686d..e2f28a7 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 8a2e8e5..ffd3a22 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 46e995d..c6554ef 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))); ++#ifdef 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); +-- +cgit v0.11.2 + |