Date: Monday, August 17, 2015 @ 10:09:38
Author: arojas
Revision: 243808
archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64
Added:
libkolab4/repos/kde-unstable-i686/PKGBUILD
(from rev 243807, libkolab4/trunk/PKGBUILD)
libkolab4/repos/kde-unstable-i686/check_for_generic_tag.patch
(from rev 243807, libkolab4/trunk/check_for_generic_tag.patch)
libkolab4/repos/kde-unstable-x86_64/PKGBUILD
(from rev 243807, libkolab4/trunk/PKGBUILD)
libkolab4/repos/kde-unstable-x86_64/check_for_generic_tag.patch
(from rev 243807, libkolab4/trunk/check_for_generic_tag.patch)
Deleted:
libkolab4/repos/kde-unstable-i686/PKGBUILD
libkolab4/repos/kde-unstable-i686/check_for_generic_tag.patch
libkolab4/repos/kde-unstable-x86_64/PKGBUILD
libkolab4/repos/kde-unstable-x86_64/check_for_generic_tag.patch
-------------------------------------------------+
/PKGBUILD | 82 ++++++++++++++++++++
/check_for_generic_tag.patch | 88 ++++++++++++++++++++++
kde-unstable-i686/PKGBUILD | 40 ----------
kde-unstable-i686/check_for_generic_tag.patch | 44 -----------
kde-unstable-x86_64/PKGBUILD | 40 ----------
kde-unstable-x86_64/check_for_generic_tag.patch | 44 -----------
6 files changed, 170 insertions(+), 168 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2015-08-17 08:08:17 UTC (rev 243807)
+++ kde-unstable-i686/PKGBUILD 2015-08-17 08:09:38 UTC (rev 243808)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-
-pkgname=libkolab4
-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' 'kdepimlibs4')
-makedepends=('cmake' 'automoc4' 'boost')
-conflicts=('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/kde-unstable-i686/PKGBUILD (from rev 243807,
libkolab4/trunk/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2015-08-17 08:09:38 UTC (rev 243808)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=libkolab4
+pkgver=0.6.0
+pkgrel=2
+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<1')
+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
+}
Deleted: kde-unstable-i686/check_for_generic_tag.patch
===================================================================
--- kde-unstable-i686/check_for_generic_tag.patch 2015-08-17 08:08:17 UTC
(rev 243807)
+++ kde-unstable-i686/check_for_generic_tag.patch 2015-08-17 08:09:38 UTC
(rev 243808)
@@ -1,44 +0,0 @@
-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/kde-unstable-i686/check_for_generic_tag.patch (from rev
243807, libkolab4/trunk/check_for_generic_tag.patch)
===================================================================
--- kde-unstable-i686/check_for_generic_tag.patch
(rev 0)
+++ kde-unstable-i686/check_for_generic_tag.patch 2015-08-17 08:09:38 UTC
(rev 243808)
@@ -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);
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2015-08-17 08:08:17 UTC (rev 243807)
+++ kde-unstable-x86_64/PKGBUILD 2015-08-17 08:09:38 UTC (rev 243808)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-
-pkgname=libkolab4
-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' 'kdepimlibs4')
-makedepends=('cmake' 'automoc4' 'boost')
-conflicts=('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/kde-unstable-x86_64/PKGBUILD (from rev 243807,
libkolab4/trunk/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2015-08-17 08:09:38 UTC (rev 243808)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=libkolab4
+pkgver=0.6.0
+pkgrel=2
+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<1')
+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
+}
Deleted: kde-unstable-x86_64/check_for_generic_tag.patch
===================================================================
--- kde-unstable-x86_64/check_for_generic_tag.patch 2015-08-17 08:08:17 UTC
(rev 243807)
+++ kde-unstable-x86_64/check_for_generic_tag.patch 2015-08-17 08:09:38 UTC
(rev 243808)
@@ -1,44 +0,0 @@
-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/kde-unstable-x86_64/check_for_generic_tag.patch (from
rev 243807, libkolab4/trunk/check_for_generic_tag.patch)
===================================================================
--- kde-unstable-x86_64/check_for_generic_tag.patch
(rev 0)
+++ kde-unstable-x86_64/check_for_generic_tag.patch 2015-08-17 08:09:38 UTC
(rev 243808)
@@ -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);
