Date: Wednesday, August 19, 2015 @ 19:23:26 Author: arojas Revision: 244383
db-move: moved libkolab from [kde-unstable] to [testing] (i686, x86_64) Added: libkolab/repos/testing-i686/ libkolab/repos/testing-i686/PKGBUILD (from rev 244381, libkolab/repos/kde-unstable-i686/PKGBUILD) libkolab/repos/testing-i686/fix-build.patch (from rev 244381, libkolab/repos/kde-unstable-i686/fix-build.patch) libkolab/repos/testing-x86_64/ libkolab/repos/testing-x86_64/PKGBUILD (from rev 244381, libkolab/repos/kde-unstable-x86_64/PKGBUILD) libkolab/repos/testing-x86_64/fix-build.patch (from rev 244381, libkolab/repos/kde-unstable-x86_64/fix-build.patch) Deleted: libkolab/repos/kde-unstable-i686/ libkolab/repos/kde-unstable-x86_64/ --------------------------------+ testing-i686/PKGBUILD | 38 ++++++++++++++++++++++ testing-i686/fix-build.patch | 67 +++++++++++++++++++++++++++++++++++++++ testing-x86_64/PKGBUILD | 38 ++++++++++++++++++++++ testing-x86_64/fix-build.patch | 67 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+) Copied: libkolab/repos/testing-i686/PKGBUILD (from rev 244381, libkolab/repos/kde-unstable-i686/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-08-19 17:23:26 UTC (rev 244383) @@ -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 +} Copied: libkolab/repos/testing-i686/fix-build.patch (from rev 244381, libkolab/repos/kde-unstable-i686/fix-build.patch) =================================================================== --- testing-i686/fix-build.patch (rev 0) +++ testing-i686/fix-build.patch 2015-08-19 17:23:26 UTC (rev 244383) @@ -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() ); + Copied: libkolab/repos/testing-x86_64/PKGBUILD (from rev 244381, libkolab/repos/kde-unstable-x86_64/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-08-19 17:23:26 UTC (rev 244383) @@ -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 +} Copied: libkolab/repos/testing-x86_64/fix-build.patch (from rev 244381, libkolab/repos/kde-unstable-x86_64/fix-build.patch) =================================================================== --- testing-x86_64/fix-build.patch (rev 0) +++ testing-x86_64/fix-build.patch 2015-08-19 17:23:26 UTC (rev 244383) @@ -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() ); +