[arch-commits] Commit in sink/repos/community-x86_64 (3 files)

Antonio Rojas arojas at archlinux.org
Tue Sep 3 06:26:14 UTC 2019


    Date: Tuesday, September 3, 2019 @ 06:26:14
  Author: arojas
Revision: 507100

archrelease: copy trunk to community-x86_64

Added:
  sink/repos/community-x86_64/PKGBUILD
    (from rev 507098, sink/trunk/PKGBUILD)
  sink/repos/community-x86_64/sink-kdav2-0.3.patch
    (from rev 507098, sink/trunk/sink-kdav2-0.3.patch)
Deleted:
  sink/repos/community-x86_64/PKGBUILD

----------------------+
 PKGBUILD             |   63 +++++++++++++++++++++++++------------------------
 sink-kdav2-0.3.patch |   57 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 30 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-03 06:26:13 UTC (rev 507099)
+++ PKGBUILD	2019-09-03 06:26:14 UTC (rev 507100)
@@ -1,30 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=sink
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="An offline-caching, synchronization and indexing system for PIM data"
-arch=(x86_64)
-url="https://community.kde.org/KDE_PIM"
-license=(LGPL)
-depends=(kcontacts kcalcore kasync kimap2 kdav2 lmdb libgit2 xapian-core)
-makedepends=(extra-cmake-modules flatbuffers)
-source=("https://download.kde.org/unstable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz")
-sha256sums=('7ef9e89cd3be0274e4b1560cfe035b5f3f056e85af65c9c4e5570878fd0a7e13')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: sink/repos/community-x86_64/PKGBUILD (from rev 507098, sink/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-03 06:26:14 UTC (rev 507100)
@@ -0,0 +1,33 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=sink
+pkgver=0.7.0
+pkgrel=5
+pkgdesc="An offline-caching, synchronization and indexing system for PIM data"
+arch=(x86_64)
+url="https://community.kde.org/KDE_PIM"
+license=(LGPL)
+depends=(kcontacts kcalcore kasync kimap2 kdav2 lmdb libgit2 xapian-core)
+makedepends=(extra-cmake-modules flatbuffers)
+source=("https://download.kde.org/unstable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"
+        sink-kdav2-0.3.patch)
+sha256sums=('7ef9e89cd3be0274e4b1560cfe035b5f3f056e85af65c9c4e5570878fd0a7e13'
+            '53e670cea7ff40c40eb9fd6754a423f54c18c42b3a59074b400db5ba117a0ff8')
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../sink-kdav2-0.3.patch # Fix build with kdav2 0.3
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: sink/repos/community-x86_64/sink-kdav2-0.3.patch (from rev 507098, sink/trunk/sink-kdav2-0.3.patch)
===================================================================
--- sink-kdav2-0.3.patch	                        (rev 0)
+++ sink-kdav2-0.3.patch	2019-09-03 06:26:14 UTC (rev 507100)
@@ -0,0 +1,57 @@
+--- a/examples/webdavcommon/webdav.cpp
++++ b/examples/webdavcommon/webdav.cpp
+@@ -30,7 +30,6 @@
+ #include <KDAV2/DavItemFetchJob>
+ #include <KDAV2/DavItemModifyJob>
+ #include <KDAV2/DavItemsListJob>
+-#include <KDAV2/EtagCache>
+ 
+ #include <QNetworkReply>
+ 
+@@ -185,8 +184,7 @@ KAsync::Job<void> WebDavSynchronizer::synchronizeCollection(const KDAV2::DavColl
+ 
+     auto localRid = collectionLocalResourceID(collection);
+ 
+-    auto cache = std::make_shared<KDAV2::EtagCache>();
+-    auto davItemsListJob = new KDAV2::DavItemsListJob(collection.url(), std::move(cache));
++    auto davItemsListJob = new KDAV2::DavItemsListJob(collection.url());
+ 
+     return runJob<KDAV2::DavItem::List>(davItemsListJob,
+         [](KJob *job) { return static_cast<KDAV2::DavItemsListJob *>(job)->items(); })
+--- a/examples/caldavresource/tests/caldavtest.cpp   2019-09-03 06:15:09.729849491 +0000
++++ b/examples/caldavresource/tests/caldavtest.cpp   2019-09-03 06:15:28.636780329 +0000
+@@ -4,7 +4,6 @@
+ #include <KDAV2/DavItemFetchJob>
+ #include <KDAV2/DavItemModifyJob>
+ #include <KDAV2/DavItemsListJob>
+-#include <KDAV2/EtagCache>
+ 
+ #include <KCalCore/Event>
+ #include <KCalCore/ICalFormat>
+@@ -266,8 +265,7 @@
+             })();
+ 
+             auto itemList = ([&collection]() -> KDAV2::DavItem::List {
+-                auto cache = std::make_shared<KDAV2::EtagCache>();
+-                auto itemsListJob = new KDAV2::DavItemsListJob(collection.url(), cache);
++                auto itemsListJob = new KDAV2::DavItemsListJob(collection.url());
+                 itemsListJob->exec();
+                 Q_ASSERT(itemsListJob->error() == 0);
+                 return itemsListJob->items();
+--- a/examples/imapresource/imapserverproxy.cpp   2019-09-03 06:19:55.527175867 +0000
++++ b/examples/imapresource/imapserverproxy.cpp   2019-09-03 06:21:28.805145783 +0000
+@@ -69,11 +69,11 @@
+     const bool isLoginJob = dynamic_cast<KIMAP2::LoginJob*>(job);
+     const bool isSelectJob = dynamic_cast<KIMAP2::SelectJob*>(job);
+     switch (error) {
+-        case KIMAP2::LoginJob::ErrorCode::ERR_HOST_NOT_FOUND:
++        case KIMAP2::HostNotFound:
+             return Imap::HostNotFoundError;
+-        case KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT:
++        case KIMAP2::CouldNotConnect:
+             return Imap::CouldNotConnectError;
+-        case KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED:
++        case KIMAP2::SslHandshakeFailed:
+             return Imap::SslHandshakeError;
+     }
+     //Hack to detect login failures


More information about the arch-commits mailing list