[arch-commits] Commit in libkolab/repos (6 files)

Antonio Rojas arojas at archlinux.org
Tue Apr 21 08:36:25 UTC 2015


    Date: Tuesday, April 21, 2015 @ 10:36:25
  Author: arojas
Revision: 237877

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libkolab/repos/extra-i686/PKGBUILD
    (from rev 237876, libkolab/trunk/PKGBUILD)
  libkolab/repos/extra-i686/check_for_generic_tag.patch
    (from rev 237876, libkolab/trunk/check_for_generic_tag.patch)
  libkolab/repos/extra-x86_64/PKGBUILD
    (from rev 237876, libkolab/trunk/PKGBUILD)
  libkolab/repos/extra-x86_64/check_for_generic_tag.patch
    (from rev 237876, libkolab/trunk/check_for_generic_tag.patch)
Deleted:
  libkolab/repos/extra-i686/PKGBUILD
  libkolab/repos/extra-x86_64/PKGBUILD

------------------------------------------+
 /PKGBUILD                                |   76 +++++++++++++++++++++++++++++
 extra-i686/PKGBUILD                      |   33 ------------
 extra-i686/check_for_generic_tag.patch   |   44 ++++++++++++++++
 extra-x86_64/PKGBUILD                    |   33 ------------
 extra-x86_64/check_for_generic_tag.patch |   44 ++++++++++++++++
 5 files changed, 164 insertions(+), 66 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-04-21 08:33:14 UTC (rev 237876)
+++ extra-i686/PKGBUILD	2015-04-21 08:36:25 UTC (rev 237877)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libkolab
-pkgver=0.5.3
-pkgrel=1
-pkgdesc="Advanced Kolab Object Handling Library"
-url='http://git.kolab.org/libkolab/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libkolabxml' 'kdepimlibs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
-md5sums=('c42b2c8cbd6de81137c3cf5b5e5a4584'
-         'b061e4dd0e94880044025a2ef244b16f')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: libkolab/repos/extra-i686/PKGBUILD (from rev 237876, libkolab/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-04-21 08:36:25 UTC (rev 237877)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libkolab
+pkgver=0.6.0
+pkgrel=1
+pkgdesc="Advanced Kolab Object Handling Library"
+url='http://git.kolab.org/libkolab/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libkolabxml' 'kdepimlibs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg} 'check_for_generic_tag.patch')
+md5sums=('3c4fc1fec2dfcc0841f29de8f6ff0cd3'
+         '237fe4fda389cb8cf167e84aea2b90b0'
+         '6588bc470183e56ca77f12e1dbb5b1ee')
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+# fix build against kdepimlibs 4.14
+  patch -p1 -i "$srcdir"/check_for_generic_tag.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Copied: libkolab/repos/extra-i686/check_for_generic_tag.patch (from rev 237876, libkolab/trunk/check_for_generic_tag.patch)
===================================================================
--- extra-i686/check_for_generic_tag.patch	                        (rev 0)
+++ extra-i686/check_for_generic_tag.patch	2015-04-21 08:36:25 UTC (rev 237877)
@@ -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);

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-04-21 08:33:14 UTC (rev 237876)
+++ extra-x86_64/PKGBUILD	2015-04-21 08:36:25 UTC (rev 237877)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libkolab
-pkgver=0.5.3
-pkgrel=1
-pkgdesc="Advanced Kolab Object Handling Library"
-url='http://git.kolab.org/libkolab/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libkolabxml' 'kdepimlibs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
-md5sums=('c42b2c8cbd6de81137c3cf5b5e5a4584'
-         'b061e4dd0e94880044025a2ef244b16f')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: libkolab/repos/extra-x86_64/PKGBUILD (from rev 237876, libkolab/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-04-21 08:36:25 UTC (rev 237877)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libkolab
+pkgver=0.6.0
+pkgrel=1
+pkgdesc="Advanced Kolab Object Handling Library"
+url='http://git.kolab.org/libkolab/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libkolabxml' 'kdepimlibs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg} 'check_for_generic_tag.patch')
+md5sums=('3c4fc1fec2dfcc0841f29de8f6ff0cd3'
+         '237fe4fda389cb8cf167e84aea2b90b0'
+         '6588bc470183e56ca77f12e1dbb5b1ee')
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+# fix build against kdepimlibs 4.14
+  patch -p1 -i "$srcdir"/check_for_generic_tag.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Copied: libkolab/repos/extra-x86_64/check_for_generic_tag.patch (from rev 237876, libkolab/trunk/check_for_generic_tag.patch)
===================================================================
--- extra-x86_64/check_for_generic_tag.patch	                        (rev 0)
+++ extra-x86_64/check_for_generic_tag.patch	2015-04-21 08:36:25 UTC (rev 237877)
@@ -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);



More information about the arch-commits mailing list