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

2015-12-09 Thread Antonio Rojas 
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 
-# Contributor: Andrea Scarpino 
-
-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 
+# Contributor: Andrea Scarpino 
+
+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 , contact.urls()) {
-   if (u.type() == Kolab::Url::Blog) {
-   addressee.insertCustom("KADDRESSBOOK", "BlogFeed", 
fromStdString(u.url()));
-@@ -664,8 +666,8 @@
- }
- 
- std::vector 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  = addressee.custom(QLatin1String("KADDRESSBOOK"), 
QLatin1String("BlogFeed"));
- if (!blogUrl.isEmpty()) {
-@@ -703,7 +705,7 @@
-

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

2015-11-25 Thread Antonio Rojas 
Date: Wednesday, November 25, 2015 @ 14:01:44
  Author: arojas
Revision: 251954

archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64

Added:
  libkolab/repos/kde-unstable-i686/PKGBUILD
(from rev 251953, libkolab/kde-unstable/PKGBUILD)
  libkolab/repos/kde-unstable-i686/fix-build.patch
(from rev 251953, libkolab/kde-unstable/fix-build.patch)
  libkolab/repos/kde-unstable-x86_64/PKGBUILD
(from rev 251953, libkolab/kde-unstable/PKGBUILD)
  libkolab/repos/kde-unstable-x86_64/fix-build.patch
(from rev 251953, 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  |   34 
 kde-unstable-i686/fix-build.patch   |   67 -
 kde-unstable-x86_64/PKGBUILD|   34 
 kde-unstable-x86_64/fix-build.patch |   67 -
 6 files changed, 200 insertions(+), 202 deletions(-)

Deleted: kde-unstable-i686/PKGBUILD
===
--- kde-unstable-i686/PKGBUILD  2015-11-25 13:00:55 UTC (rev 251953)
+++ kde-unstable-i686/PKGBUILD  2015-11-25 13:01:44 UTC (rev 251954)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas 
-# Contributor: Andrea Scarpino 
-
-pkgname=libkolab
-pkgver=1.0.1.git20151120
-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)
-makedepends+=(git)
-#source=("http://mirror.kolabsys.com/pub/releases/$pkgname-$pkgver.tar.gz"{,.gpg})
-source=("git+https://git.kolab.org/diffusion/LK/libkolab.git#commit=6cb420ec6f71;)
-md5sums=('SKIP')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname \
--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 251953, 
libkolab/kde-unstable/PKGBUILD)
===
--- kde-unstable-i686/PKGBUILD  (rev 0)
+++ kde-unstable-i686/PKGBUILD  2015-11-25 13:01:44 UTC (rev 251954)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Antonio Rojas 
+# Contributor: Andrea Scarpino 
+
+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
+}

Deleted: kde-unstable-i686/fix-build.patch
===
--- kde-unstable-i686/fix-build.patch   2015-11-25 13:00:55 UTC (rev 251953)
+++ kde-unstable-i686/fix-build.patch   2015-11-25 13:01:44 UTC (rev 251954)
@@ -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 , contact.urls()) {
-   if (u.type() == Kolab::Url::Blog) {
-   addressee.insertCustom("KADDRESSBOOK", "BlogFeed", 
fromStdString(u.url()));
-@@ -664,8 +666,8 @@
- }
- 
- std::vector 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  = addressee.custom(QLatin1String("KADDRESSBOOK"), 
QLatin1String("BlogFeed"));
- if (!blogUrl.isEmpty()) {
-@@

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

2015-08-19 Thread Antonio Rojas 
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.patch2015-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::vectorKolab::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::vectorKolab::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() );
+