[arch-commits] Commit in libkolab/trunk (PKGBUILD check_for_generic_tag.patch)

[Antonio Rojas]

    Date: Tuesday, April 21, 2015 @ 10:32:29
  Author: arojas
Revision: 237862

Update to 0.6.0

Added:
  libkolab/trunk/check_for_generic_tag.patch
Modified:
  libkolab/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   15 +++++++++-----
 check_for_generic_tag.patch |   44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-21 08:26:57 UTC (rev 237861)
+++ PKGBUILD	2015-04-21 08:32:29 UTC (rev 237862)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=libkolab
-pkgver=0.5.3
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="Advanced Kolab Object Handling Library"
 url='http://git.kolab.org/libkolab/'
@@ -10,12 +10,17 @@
 license=('GPL')
 depends=('libkolabxml' 'kdepimlibs')
 makedepends=('cmake' 'automoc4' 'boost')
-source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
-md5sums=('c42b2c8cbd6de81137c3cf5b5e5a4584'
-         'b061e4dd0e94880044025a2ef244b16f')
+source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg} 'check_for_generic_tag.patch')
+md5sums=('3c4fc1fec2dfcc0841f29de8f6ff0cd3'
+         '237fe4fda389cb8cf167e84aea2b90b0'
+         '6588bc470183e56ca77f12e1dbb5b1ee')
 
 prepare() {
-  mkdir build
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+# fix build against kdepimlibs 4.14
+  patch -p1 -i "$srcdir"/check_for_generic_tag.patch
 }
 
 build() {

Added: check_for_generic_tag.patch
===================================================================
--- check_for_generic_tag.patch	                        (rev 0)
+++ check_for_generic_tag.patch	2015-04-21 08:32:29 UTC (rev 237862)
@@ -0,0 +1,44 @@
+From 34edc0a846b87570c06a5942b458adb720a34a9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <mail at sandroknauss.de>
+Date: Tue, 10 Feb 2015 10:59:18 +0100
+Subject: Make libkolab compile with upstream kdepimlibs
+
+Because GENERIC tags have not entered upstream, we have to test for
+support. Our integration branch not supports a feature flag to indicate
+the availability of that feature.
+
+KOLAB: #4448
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 365edac..bd53e27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,11 @@ add_definitions( -DKDEPIMLIBS_VERSION_MAJOR=${KdepimLibs_VERSION_MAJOR} )
+ add_definitions( -DKDEPIMLIBS_VERSION_MINOR=${KdepimLibs_VERSION_MINOR} )
+ add_definitions( -DKDEPIMLIBS_VERSION_PATCH=${KdepimLibs_VERSION_PATCH} )
+ 
++#Tag::GENERIC is only available at the moment at the kolab/integration branches
++if (KDEPIMLIBS_HAS_GENERIC_TAG)
++    add_definitions( -DKDEPIMLIBS_HAS_GENERIC_TAG)
++endif()
++
+ if("${KdepimLibs_VERSION}" VERSION_GREATER "4.8.40" OR USE_LIBCALENDARING)
+     add_definitions(-DKDEPIMLIBS_VERSION_DEVEL)
+ endif()
+diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
+index 681b4a5..e5c404d 100644
+--- a/kolabformat/kolabobject.cpp
++++ b/kolabformat/kolabobject.cpp
+@@ -435,8 +435,11 @@ ObjectType KolabObjectReader::Private::readKolabV3(const KMime::Message::Ptr &ms
+                 mTag = Akonadi::Tag();
+                 mTag.setName(Conversion::fromStdString(relation.name()));
+                 mTag.setGid(Conversion::fromStdString(configuration.uid()).toLatin1());
++#ifdef KDEPIMLIBS_HAS_GENERIC_TAG
+                 mTag.setType(Akonadi::Tag::GENERIC);
+-
++#else
++                mTag.setType(Akonadi::Tag::PLAIN);
++#endif
+                 mTagMembers.reserve(relation.members().size());
+                 foreach (const std::string &member, relation.members()) {
+                     mTagMembers << Conversion::fromStdString(member);