Date: Wednesday, August 19, 2015 @ 09:32:09 Author: arojas Revision: 244161
Merge kde-unstable Added: libkgapi/trunk/ libkolab/trunk/ libkolab/trunk/PKGBUILD (from rev 243758, libkolab/kde-unstable/PKGBUILD) libkolab/trunk/fix-build.patch (from rev 243758, libkolab/kde-unstable/fix-build.patch) Deleted: libkgapi/trunk/ libkolab/trunk/ libkolab/trunk/PKGBUILD libkolab/trunk/check_for_generic_tag.patch --------------------------------+ PKGBUILD | 33 ------------------- check_for_generic_tag.patch | 44 ------------------------- libkolab/trunk/PKGBUILD | 38 ++++++++++++++++++++++ libkolab/trunk/fix-build.patch | 67 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 77 deletions(-) Deleted: libkolab/trunk/PKGBUILD =================================================================== --- libkolab/kde-unstable/PKGBUILD 2015-08-15 02:17:14 UTC (rev 243721) +++ libkolab/trunk/PKGBUILD 2015-08-19 07:32:09 UTC (rev 244161) @@ -1,33 +0,0 @@ -# $Id$ -# Maintaier: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=libkolab -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Advanced Kolab Object Handling Library" -url='http://git.kolab.org/libkolab/' -arch=(i686 x86_64) -license=(GPL) -depends=(libkolabxml akonadi-notes akonadi-client kcontacts kcalutils) -makedepends=(extra-cmake-modules kdoctools boost) -source=("http://mirror.kolabsys.com/pub/releases/$pkgname-$pkgver.tar.gz"{,.gpg}) -md5sums=('3670aae0d6b2ad32f65abd65352e79eb' - 'c88d8e0945048f798a85b38e9d401460') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: libkolab/trunk/PKGBUILD (from rev 243758, libkolab/kde-unstable/PKGBUILD) =================================================================== --- libkolab/trunk/PKGBUILD (rev 0) +++ libkolab/trunk/PKGBUILD 2015-08-19 07:32:09 UTC (rev 244161) @@ -0,0 +1,38 @@ +# $Id$ +# Maintaier: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=libkolab +pkgver=1.0.1 +pkgrel=1 +pkgdesc="Advanced Kolab Object Handling Library" +url='http://git.kolab.org/libkolab/' +arch=(i686 x86_64) +license=(GPL) +depends=(libkolabxml akonadi-notes akonadi-client kcontacts kcalutils) +makedepends=(extra-cmake-modules kdoctools boost) +source=("http://mirror.kolabsys.com/pub/releases/$pkgname-$pkgver.tar.gz"{,.gpg} 'fix-build.patch') +md5sums=('3e6a023da106fd6723f92cf96aad47c6' + 'e406079c5bd1bbc5eab96d9dead42714' + '46198b207b39d9f067812ce10114ab19') + +prepare() { + mkdir -p build + +# Fix build against kcontacts 15.08 + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/fix-build.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: libkolab/trunk/check_for_generic_tag.patch =================================================================== --- libkolab/kde-unstable/check_for_generic_tag.patch 2015-08-15 02:17:14 UTC (rev 243721) +++ libkolab/trunk/check_for_generic_tag.patch 2015-08-19 07:32:09 UTC (rev 244161) @@ -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: libkolab/trunk/fix-build.patch (from rev 243758, libkolab/kde-unstable/fix-build.patch) =================================================================== --- libkolab/trunk/fix-build.patch (rev 0) +++ libkolab/trunk/fix-build.patch 2015-08-19 07:32:09 UTC (rev 244161) @@ -0,0 +1,67 @@ +diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp +--- a/conversion/kabcconversion.cpp ++++ b/conversion/kabcconversion.cpp +@@ -488,7 +488,9 @@ + addressee.setTitle(fromStdString(contact.titles().at(0))); //TODO support multiple + } + if (!contact.urls().empty()) { +- addressee.setUrl(QUrl(fromStdString(contact.urls().at(0).url()))); //TODO support multiple ++ KContacts::ResourceLocatorUrl url; ++ url.setUrl(QUrl(fromStdString(contact.urls().at(0).url()))); //TODO support multiple ++ addressee.setUrl(url); + foreach(const Kolab::Url &u, contact.urls()) { + if (u.type() == Kolab::Url::Blog) { + addressee.insertCustom("KADDRESSBOOK", "BlogFeed", fromStdString(u.url())); +@@ -664,8 +666,8 @@ + } + + std::vector<Kolab::Url> urls; +- if (!addressee.url().isEmpty()) { +- urls.push_back(Kolab::Url(toStdString(addressee.url().url()))); ++ if (!addressee.url().url().isEmpty()) { ++ urls.push_back(Kolab::Url(toStdString(addressee.url().url().url()))); + } + const QString &blogUrl = addressee.custom(QLatin1String("KADDRESSBOOK"), QLatin1String("BlogFeed")); + if (!blogUrl.isEmpty()) { +@@ -703,7 +705,7 @@ + c.setRelateds(std::vector<Kolab::Related>() << Kolab::Related(Kolab::Related::Text, toStdString(spouse), Kolab::Related::Spouse)); + } + c.setBDay(fromDate(KDateTime(addressee.birthday(), KDateTime::ClockTime))); +- c.setAnniversary(fromDate(KDateTime(QDate::fromString( addressee.custom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Anniversary")), Qt::ISODate ), KDateTime::ClockTime))); ++ c.setAnniversary(fromDate(KDateTime(QDate::fromString( addressee.custom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Anniversary")), Qt::ISODate ), KDateTime::Spec(KDateTime::ClockTime)))); + if (!addressee.photo().isEmpty()) { + std::string mimetype; + const std::string &photo = fromPicture(addressee.photo(), mimetype); +diff --git a/kolabformatV2/contact.cpp b/kolabformatV2/contact.cpp +--- a/kolabformatV2/contact.cpp ++++ b/kolabformatV2/contact.cpp +@@ -947,7 +947,7 @@ + setPrefix( addressee->prefix() ); + setSuffix( addressee->suffix() ); + setOrganization( addressee->organization() ); +- setWebPage( addressee->url().url() ); ++ setWebPage( addressee->url().url().url() ); + setIMAddress( addressee->custom( "KADDRESSBOOK", "X-IMAddress" ) ); + setDepartment( addressee->department()); + setOfficeLocation( addressee->custom( "KADDRESSBOOK", "X-Office" ) ); +@@ -1082,15 +1082,18 @@ + { + // TODO: This needs the same set of TODOs as the setFields method + KolabBase::saveTo( addressee ); ++ KContacts::ResourceLocatorUrl url; ++ ++ url.setUrl(QUrl(webPage())); + + addressee->setGivenName( givenName() ); + addressee->setAdditionalName( middleNames() ); + addressee->setFamilyName( lastName() ); + addressee->setFormattedName( fullName() ); + addressee->setPrefix( prefix() ); + addressee->setSuffix( suffix() ); + addressee->setOrganization( organization() ); +- addressee->setUrl( QUrl(webPage()) ); ++ addressee->setUrl(url); + addressee->insertCustom( "KADDRESSBOOK", "X-IMAddress", imAddress() ); + addressee->setDepartment( department() ); + addressee->insertCustom( "KADDRESSBOOK", "X-Office", officeLocation() ); +