[arch-commits] Commit in digikam/trunk (2 files)
Antonio Rojas
arojas at archlinux.org
Wed Jan 10 20:31:26 UTC 2018
Date: Wednesday, January 10, 2018 @ 20:31:26
Author: arojas
Revision: 314330
Drop patches
Deleted:
digikam/trunk/digikam-kcalcore-17.12.patch
digikam/trunk/digikam-opencv-3.4.patch
------------------------------+
digikam-kcalcore-17.12.patch | 77 --------------------
digikam-opencv-3.4.patch | 156 -----------------------------------------
2 files changed, 233 deletions(-)
Deleted: digikam-kcalcore-17.12.patch
===================================================================
--- digikam-kcalcore-17.12.patch 2018-01-10 20:30:33 UTC (rev 314329)
+++ digikam-kcalcore-17.12.patch 2018-01-10 20:31:26 UTC (rev 314330)
@@ -1,77 +0,0 @@
-From dad750fadc926b62603cc9d64009ee5072a46d97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil at 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
----
- 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
-@@ -290,7 +290,13 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
- return;
- }
-
-- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
-+#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();
-@@ -308,9 +309,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
-
Deleted: digikam-opencv-3.4.patch
===================================================================
--- digikam-opencv-3.4.patch 2018-01-10 20:30:33 UTC (rev 314329)
+++ digikam-opencv-3.4.patch 2018-01-10 20:31:26 UTC (rev 314330)
@@ -1,156 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2d9c6212f..6341db8d32 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -245,7 +245,7 @@ endif()
- if(ENABLE_OPENCV3)
-
- set(OPENCV_MIN_VERSION "3.1.0")
-- DETECT_OPENCV(${OPENCV_MIN_VERSION} core objdetect imgproc imgcodecs)
-+ DETECT_OPENCV(${OPENCV_MIN_VERSION} core objdetect imgproc imgcodecs face)
-
- if(${OpenCV_FOUND})
- if(${OpenCV_VERSION} VERSION_LESS 3.1.0)
-diff --git a/libs/facesengine/opencv3-face/face.hpp b/libs/facesengine/opencv3-face/face.hpp
-index a99e7b349b..200b5b8b00 100644
---- a/libs/facesengine/opencv3-face/face.hpp
-+++ b/libs/facesengine/opencv3-face/face.hpp
-@@ -47,6 +47,7 @@ the use of this software, even if advised of the possibility of such damage.
-
- */
-
-+#include "libopencv.h"
- #include "opencv2/core.hpp"
- #include "predict_collector.hpp"
- #include <map>
-@@ -318,8 +319,12 @@ public:
- The suffix const means that prediction does not affect the internal model state, so the method can
- be safely called from within different threads.
- */
-+#if OPENCV_TEST_VERSION(3,4,0)
- CV_WRAP virtual void save(const String& filename) const;
--
-+#else
-+ CV_WRAP virtual void write(const String& filename) const;
-+#endif
-+
- /** @brief Loads a FaceRecognizer and its model state.
-
- Loads a persisted model and state from a given XML or YAML file . Every FaceRecognizer has to
-@@ -327,17 +332,29 @@ public:
- FaceRecognizer::load(FileStorage& fs) in turn gets called by
- FaceRecognizer::load(const String& filename), to ease saving a model.
- */
-+#if OPENCV_TEST_VERSION(3,4,0)
- CV_WRAP virtual void load(const String& filename);
--
-+#else
-+ CV_WRAP virtual void read(const String& filename);
-+#endif
-+
- /** @overload
- Saves this model to a given FileStorage.
- @param fs The FileStorage to store this FaceRecognizer to.
- */
-+#if OPENCV_TEST_VERSION(3,4,0)
- virtual void save(FileStorage& fs) const = 0;
--
-+#else
-+ virtual void write(FileStorage& fs) const = 0;
-+#endif
-+
- /** @overload */
-+#if OPENCV_TEST_VERSION(3,4,0)
- virtual void load(const FileStorage& fs) = 0;
--
-+#else
-+ virtual void read(const FileStorage& fs) = 0;
-+#endif
-+
- /** @brief Sets string info for the specified model's label.
-
- The string info is replaced by the provided value if it was set before for the specified label.
-diff --git a/libs/facesengine/opencv3-face/facerec.cpp b/libs/facesengine/opencv3-face/facerec.cpp
-index a58124be1f..21ad5e57e7 100644
---- a/libs/facesengine/opencv3-face/facerec.cpp
-+++ b/libs/facesengine/opencv3-face/facerec.cpp
-@@ -66,21 +66,37 @@ void FaceRecognizer::update(InputArrayOfArrays src, InputArray labels)
- CV_Error(Error::StsNotImplemented, error_msg);
- }
-
-+#if OPENCV_TEST_VERSION(3,4,0)
- void FaceRecognizer::load(const String &filename)
-+#else
-+void FaceRecognizer::read(const String &filename)
-+#endif
- {
- FileStorage fs(filename, FileStorage::READ);
- if (!fs.isOpened())
- CV_Error(Error::StsError, "File can't be opened for writing!");
-+#if OPENCV_TEST_VERSION(3,4,0)
- this->load(fs);
-+#else
-+ this->read(fs);
-+#endif
- fs.release();
- }
-
-+#if OPENCV_TEST_VERSION(3,4,0)
- void FaceRecognizer::save(const String &filename) const
-+#else
-+void FaceRecognizer::write(const String &filename) const
-+#endif
- {
- FileStorage fs(filename, FileStorage::WRITE);
- if (!fs.isOpened())
- CV_Error(Error::StsError, "File can't be opened for writing!");
-+#if OPENCV_TEST_VERSION(3,4,0)
- this->save(fs);
-+#else
-+ this->write(fs);
-+#endif
- fs.release();
- }
-
-diff --git a/libs/facesengine/recognition-opencv-lbph/facerec_borrowed.h b/libs/facesengine/recognition-opencv-lbph/facerec_borrowed.h
-index 0ff718fc2f..4561db8af5 100644
---- a/libs/facesengine/recognition-opencv-lbph/facerec_borrowed.h
-+++ b/libs/facesengine/recognition-opencv-lbph/facerec_borrowed.h
-@@ -104,9 +104,12 @@ public:
- #if OPENCV_TEST_VERSION(3,0,0)
- using cv::FaceRecognizer::save;
- using cv::FaceRecognizer::load;
--#else
-+#elif OPENCV_TEST_VERSION(3,4,0)
- using cv::face::FaceRecognizer::save;
- using cv::face::FaceRecognizer::load;
-+#else
-+ using cv::face::FaceRecognizer::write;
-+ using cv::face::FaceRecognizer::read;
- #endif
-
- static cv::Ptr<LBPHFaceRecognizer> create(int radius=1,
-@@ -160,8 +163,10 @@ public:
- */
- #if OPENCV_TEST_VERSION(3,1,0)
- void load(const cv::FileStorage&) {}
--#else
-+#elif OPENCV_TEST_VERSION(3,4,0)
- void load(const cv::FileStorage&) override {}
-+#else
-+ void read(const cv::FileStorage&) override {}
- #endif
-
- /**
-@@ -169,8 +174,10 @@ public:
- */
- #if OPENCV_TEST_VERSION(3,1,0)
- void save(cv::FileStorage&) const {}
--#else
-+#elif OPENCV_TEST_VERSION(3,4,0)
- void save(cv::FileStorage&) const override {}
-+#else
-+ void write(cv::FileStorage&) const override {}
- #endif
-
- /**
More information about the arch-commits
mailing list