Date: Wednesday, December 9, 2015 @ 10:05:58 Author: arojas Revision: 254994
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64 Added: libkolab/repos/kde-unstable-i686/PKGBUILD (from rev 254993, libkolab/kde-unstable/PKGBUILD) libkolab/repos/kde-unstable-i686/fix-build.patch (from rev 254993, libkolab/kde-unstable/fix-build.patch) libkolab/repos/kde-unstable-x86_64/PKGBUILD (from rev 254993, libkolab/kde-unstable/PKGBUILD) libkolab/repos/kde-unstable-x86_64/fix-build.patch (from rev 254993, libkolab/kde-unstable/fix-build.patch) Deleted: libkolab/repos/kde-unstable-i686/PKGBUILD libkolab/repos/kde-unstable-i686/fix-build.patch libkolab/repos/kde-unstable-x86_64/PKGBUILD libkolab/repos/kde-unstable-x86_64/fix-build.patch -------------------------------------+ /PKGBUILD | 66 ++++++++++++++++ /fix-build.patch | 134 ++++++++++++++++++++++++++++++++++ kde-unstable-i686/PKGBUILD | 33 -------- kde-unstable-i686/fix-build.patch | 67 ----------------- kde-unstable-x86_64/PKGBUILD | 33 -------- kde-unstable-x86_64/fix-build.patch | 67 ----------------- 6 files changed, 200 insertions(+), 200 deletions(-) Deleted: kde-unstable-i686/PKGBUILD =================================================================== --- kde-unstable-i686/PKGBUILD 2015-12-09 09:04:52 UTC (rev 254993) +++ kde-unstable-i686/PKGBUILD 2015-12-09 09:05:58 UTC (rev 254994) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=libkolab -pkgver=1.0.2 -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=('312f35920989fd115386ee256fe78ba2' - '9c829ce9983b3c8cbab9ce833c982924') - -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/repos/kde-unstable-i686/PKGBUILD (from rev 254993, libkolab/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-i686/PKGBUILD (rev 0) +++ kde-unstable-i686/PKGBUILD 2015-12-09 09:05:58 UTC (rev 254994) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=libkolab +pkgver=1.0.2 +pkgrel=2 +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=('312f35920989fd115386ee256fe78ba2' + '9c829ce9983b3c8cbab9ce833c982924') + +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 +} Deleted: kde-unstable-i686/fix-build.patch =================================================================== --- kde-unstable-i686/fix-build.patch 2015-12-09 09:04:52 UTC (rev 254993) +++ kde-unstable-i686/fix-build.patch 2015-12-09 09:05:58 UTC (rev 254994) @@ -1,67 +0,0 @@ -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/kde-unstable-i686/fix-build.patch (from rev 254993, libkolab/kde-unstable/fix-build.patch) =================================================================== --- kde-unstable-i686/fix-build.patch (rev 0) +++ kde-unstable-i686/fix-build.patch 2015-12-09 09:05:58 UTC (rev 254994) @@ -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() ); + Deleted: kde-unstable-x86_64/PKGBUILD =================================================================== --- kde-unstable-x86_64/PKGBUILD 2015-12-09 09:04:52 UTC (rev 254993) +++ kde-unstable-x86_64/PKGBUILD 2015-12-09 09:05:58 UTC (rev 254994) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=libkolab -pkgver=1.0.2 -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=('312f35920989fd115386ee256fe78ba2' - '9c829ce9983b3c8cbab9ce833c982924') - -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/repos/kde-unstable-x86_64/PKGBUILD (from rev 254993, libkolab/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-x86_64/PKGBUILD (rev 0) +++ kde-unstable-x86_64/PKGBUILD 2015-12-09 09:05:58 UTC (rev 254994) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=libkolab +pkgver=1.0.2 +pkgrel=2 +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=('312f35920989fd115386ee256fe78ba2' + '9c829ce9983b3c8cbab9ce833c982924') + +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 +} Deleted: kde-unstable-x86_64/fix-build.patch =================================================================== --- kde-unstable-x86_64/fix-build.patch 2015-12-09 09:04:52 UTC (rev 254993) +++ kde-unstable-x86_64/fix-build.patch 2015-12-09 09:05:58 UTC (rev 254994) @@ -1,67 +0,0 @@ -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/kde-unstable-x86_64/fix-build.patch (from rev 254993, libkolab/kde-unstable/fix-build.patch) =================================================================== --- kde-unstable-x86_64/fix-build.patch (rev 0) +++ kde-unstable-x86_64/fix-build.patch 2015-12-09 09:05:58 UTC (rev 254994) @@ -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() ); +