Commit e0220c5b authored by Florent Revest's avatar Florent Revest

Adds Mer's fork of KCalCore which is outdated but needed by...

Adds Mer's fork of KCalCore which is outdated but needed by nemo-qml-plugin-calendar. Should be replaced later on by QtPIM
parent 458a5d66
From 27805f474799ef3bab03e7eb5e5c1185e423b5bc Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Sun, 23 Oct 2016 11:47:40 +0200
Subject: [PATCH] Removes unused reference to a host include directory
---
kcalcore/calendar.cpp | 2 +-
kcalcore/icalformat_p.h | 2 +-
kcalcore/icaltimezones.cpp | 4 ++--
kcalcore/kcalcore.pro | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kcalcore/calendar.cpp b/kcalcore/calendar.cpp
index cd80b58..3d8fbfc 100644
--- a/kcalcore/calendar.cpp
+++ b/kcalcore/calendar.cpp
@@ -43,7 +43,7 @@
#include <KDebug>
extern "C" {
- #include <icaltimezone.h>
+ #include <libical/icaltimezone.h>
}
#include <algorithm> // for std::remove()
diff --git a/kcalcore/icalformat_p.h b/kcalcore/icalformat_p.h
index b6b8f17..7632473 100644
--- a/kcalcore/icalformat_p.h
+++ b/kcalcore/icalformat_p.h
@@ -44,7 +44,7 @@
#include <KDateTime>
-#include <ical.h>
+#include <libical/ical.h>
class QDate;
diff --git a/kcalcore/icaltimezones.cpp b/kcalcore/icaltimezones.cpp
index c78b33d..c14c5ae 100644
--- a/kcalcore/icaltimezones.cpp
+++ b/kcalcore/icaltimezones.cpp
@@ -35,8 +35,8 @@
#include <QtCore/QTextStream>
extern "C" {
- #include <ical.h>
- #include <icaltimezone.h>
+ #include <libical/ical.h>
+ #include <libical/icaltimezone.h>
}
#if defined(HAVE_UUID_UUID_H)
diff --git a/kcalcore/kcalcore.pro b/kcalcore/kcalcore.pro
index afbd4b9..b505688 100644
--- a/kcalcore/kcalcore.pro
+++ b/kcalcore/kcalcore.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
equals(QT_MAJOR_VERSION, 4): TARGET = kcalcoren
equals(QT_MAJOR_VERSION, 5): TARGET = kcalcoren-qt5
DEPENDPATH += . tests versit klibport kdedate
-INCLUDEPATH += . versit klibport kdedate tests /usr/include/libical
+INCLUDEPATH += . versit klibport kdedate tests
VERSION += 4.10.2
--
2.9.3
SUMMARY = "Mer's Qt5 fork of KDE PIM 4's core component"
HOMEPAGE = "https://git.merproject.org/mer-core/kcalcore"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
SRC_URI = "git://git.merproject.org/mer-core/kcalcore.git;protocol=https \
file://0001-Removes-unused-reference-to-a-host-include-directory.patch"
SRCREV = "7db97a571b828e671cfa2ee851893d1c5a2891e3"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
inherit qmake5
DEPENDS += "qtbase timed libical"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment