[arch-commits] Commit in libkolab/trunk (PKGBUILD fix-build.patch)

[Antonio Rojas]

    Date: Wednesday, December 16, 2015 @ 18:53:39
  Author: arojas
Revision: 256678

Update to 1.0.2

Modified:
  libkolab/trunk/PKGBUILD
Deleted:
  libkolab/trunk/fix-build.patch

-----------------+
 PKGBUILD        |   19 +++++----------
 fix-build.patch |   67 ------------------------------------------------------
 2 files changed, 7 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-16 17:39:27 UTC (rev 256677)
+++ PKGBUILD	2015-12-16 17:53:39 UTC (rev 256678)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintaier: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=libkolab
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=2
 pkgdesc="Advanced Kolab Object Handling Library"
 url='http://git.kolab.org/libkolab/'
@@ -10,23 +10,18 @@
 arch=(i686 x86_64)
 license=(GPL)
 depends=(libkolabxml akonadi-notes akonadi-client kcontacts kcalutils)
-makedepends=(extra-cmake-modules kdoctools boost git)
-#source=("http://mirror.kolabsys.com/pub/releases/$pkgname-$pkgver.tar.gz"{,.gpg} 'fix-build.patch')
-source=("git+https://git.kolab.org/diffusion/LK/libkolab.git#tag=libkolab-1.0.1" 'fix-build.patch')
-md5sums=('SKIP'
-         '46198b207b39d9f067812ce10114ab19')
+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
-
-# Fix build against kcontacts 15.08
-  cd $pkgname
-  patch -p1 -i "$srcdir"/fix-build.patch
 }
 
 build() {
   cd build
-  cmake ../$pkgname \
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2015-12-16 17:39:27 UTC (rev 256677)
+++ fix-build.patch	2015-12-16 17:53:39 UTC (rev 256678)
@@ -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() );
-