Date: Monday, December 7, 2015 @ 13:47:00 Author: allan Revision: 253335
archrelease: copy trunk to staging-i686, staging-x86_64 Added: libkolab4/repos/staging-i686/ libkolab4/repos/staging-i686/PKGBUILD (from rev 253332, libkolab4/trunk/PKGBUILD) libkolab4/repos/staging-i686/check_for_generic_tag.patch (from rev 253332, libkolab4/trunk/check_for_generic_tag.patch) libkolab4/repos/staging-x86_64/ libkolab4/repos/staging-x86_64/PKGBUILD (from rev 253334, libkolab4/trunk/PKGBUILD) libkolab4/repos/staging-x86_64/check_for_generic_tag.patch (from rev 253334, libkolab4/trunk/check_for_generic_tag.patch) --------------------------------------------+ staging-i686/PKGBUILD | 41 +++++++++++++++++++++++++ staging-i686/check_for_generic_tag.patch | 44 +++++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 41 +++++++++++++++++++++++++ staging-x86_64/check_for_generic_tag.patch | 44 +++++++++++++++++++++++++++ 4 files changed, 170 insertions(+) Copied: libkolab4/repos/staging-i686/PKGBUILD (from rev 253332, libkolab4/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-12-07 12:47:00 UTC (rev 253335) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=libkolab4 +pkgver=0.6.0 +pkgrel=5 +pkgdesc="Advanced Kolab Object Handling Library" +url='http://git.kolab.org/libkolab/' +arch=('i686' 'x86_64') +license=('GPL') +depends=('libkolabxml' 'kdepimlibs4') +makedepends=('cmake' 'automoc4' 'boost') +conflicts=('libkolab') +replaces=('libkolab<1') +source=("http://mirror.kolabsys.com/pub/releases/libkolab-${pkgver}.tar.gz"{,.gpg} 'check_for_generic_tag.patch') +md5sums=('3c4fc1fec2dfcc0841f29de8f6ff0cd3' + '237fe4fda389cb8cf167e84aea2b90b0' + '6588bc470183e56ca77f12e1dbb5b1ee') + +prepare() { + mkdir -p build + + cd libkolab-$pkgver +# fix build against kdepimlibs 4.14 + patch -p1 -i "$srcdir"/check_for_generic_tag.patch +} + +build() { + cd build + cmake ../libkolab-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Copied: libkolab4/repos/staging-i686/check_for_generic_tag.patch (from rev 253332, libkolab4/trunk/check_for_generic_tag.patch) =================================================================== --- staging-i686/check_for_generic_tag.patch (rev 0) +++ staging-i686/check_for_generic_tag.patch 2015-12-07 12:47:00 UTC (rev 253335) @@ -0,0 +1,44 @@ +From 34edc0a846b87570c06a5942b458adb720a34a9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <m...@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); Copied: libkolab4/repos/staging-x86_64/PKGBUILD (from rev 253334, libkolab4/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-12-07 12:47:00 UTC (rev 253335) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=libkolab4 +pkgver=0.6.0 +pkgrel=5 +pkgdesc="Advanced Kolab Object Handling Library" +url='http://git.kolab.org/libkolab/' +arch=('i686' 'x86_64') +license=('GPL') +depends=('libkolabxml' 'kdepimlibs4') +makedepends=('cmake' 'automoc4' 'boost') +conflicts=('libkolab') +replaces=('libkolab<1') +source=("http://mirror.kolabsys.com/pub/releases/libkolab-${pkgver}.tar.gz"{,.gpg} 'check_for_generic_tag.patch') +md5sums=('3c4fc1fec2dfcc0841f29de8f6ff0cd3' + '237fe4fda389cb8cf167e84aea2b90b0' + '6588bc470183e56ca77f12e1dbb5b1ee') + +prepare() { + mkdir -p build + + cd libkolab-$pkgver +# fix build against kdepimlibs 4.14 + patch -p1 -i "$srcdir"/check_for_generic_tag.patch +} + +build() { + cd build + cmake ../libkolab-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Copied: libkolab4/repos/staging-x86_64/check_for_generic_tag.patch (from rev 253334, libkolab4/trunk/check_for_generic_tag.patch) =================================================================== --- staging-x86_64/check_for_generic_tag.patch (rev 0) +++ staging-x86_64/check_for_generic_tag.patch 2015-12-07 12:47:00 UTC (rev 253335) @@ -0,0 +1,44 @@ +From 34edc0a846b87570c06a5942b458adb720a34a9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <m...@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);