0002-Make-libkolab-compile-with-upstream-kdepimlibs.patch

   1 From 34edc0a846b87570c06a5942b458adb720a34a9b Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <mail@sandroknauss.de>
   3 Date: Tue, 10 Feb 2015 10:59:18 +0100
   4 Subject: [PATCH] Make libkolab compile with upstream kdepimlibs
   5
   6 Because GENERIC tags have not entered upstream, we have to test for
   7 support. Our integration branch not supports a feature flag to indicate
   8 the availability of that feature.
   9
  10 KOLAB: #4448
  11 ---
  12  CMakeLists.txt              | 5 +++++
  13  kolabformat/kolabobject.cpp | 5 ++++-
  14  2 files changed, 9 insertions(+), 1 deletion(-)
  15
  16 diff --git a/CMakeLists.txt b/CMakeLists.txt
  17 index 365edac..bd53e27 100644
  18 --- a/CMakeLists.txt
  19 +++ b/CMakeLists.txt
  20 @@ -78,6 +78,11 @@ add_definitions( -DKDEPIMLIBS_VERSION_MAJOR=${KdepimLibs_VERSION_MAJOR} )
  21  add_definitions( -DKDEPIMLIBS_VERSION_MINOR=${KdepimLibs_VERSION_MINOR} )
  22  add_definitions( -DKDEPIMLIBS_VERSION_PATCH=${KdepimLibs_VERSION_PATCH} )
  23
  24 +#Tag::GENERIC is only available at the moment at the kolab/integration branches
  25 +if (KDEPIMLIBS_HAS_GENERIC_TAG)
  26 +    add_definitions( -DKDEPIMLIBS_HAS_GENERIC_TAG)
  27 +endif()
  28 +
  29  if("${KdepimLibs_VERSION}" VERSION_GREATER "4.8.40" OR USE_LIBCALENDARING)
  30      add_definitions(-DKDEPIMLIBS_VERSION_DEVEL)
  31  endif()
  32 diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
  33 index 681b4a5..e5c404d 100644
  34 --- a/kolabformat/kolabobject.cpp
  35 +++ b/kolabformat/kolabobject.cpp
  36 @@ -435,8 +435,11 @@ ObjectType KolabObjectReader::Private::readKolabV3(const KMime::Message::Ptr &ms
  37                  mTag = Akonadi::Tag();
  38                  mTag.setName(Conversion::fromStdString(relation.name()));
  39                  mTag.setGid(Conversion::fromStdString(configuration.uid()).toLatin1());
  40 +#ifdef KDEPIMLIBS_HAS_GENERIC_TAG
  41                  mTag.setType(Akonadi::Tag::GENERIC);
  42 -
  43 +#else
  44 +                mTag.setType(Akonadi::Tag::PLAIN);
  45 +#endif
  46                  mTagMembers.reserve(relation.members().size());
  47                  foreach (const std::string &member, relation.members()) {
  48                      mTagMembers << Conversion::fromStdString(member);
  49 --
  50 2.1.4
  51