libre/kdepim-runtime: updated to 18.12.2

2 files changed, 65 insertions, 48 deletions

diff --git a/libre/kdepim-runtime/PKGBUILD b/libre/kdepim-runtime/PKGBUILD
index 90a24ee94..ce4a0a782 100644
--- a/libre/kdepim-runtime/PKGBUILD
+++ b/libre/kdepim-runtime/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 290221 2017-03-09 16:12:45Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 
 pkgname=kdepim-runtime
-pkgver=16.12.3
-pkgrel=1.parabola2
-pkgdesc='Extends the functionality of kdepim (built without nonfree qt5-webengine)'
-arch=('i686' 'x86_64' 'armv7h')
-url='https://community.kde.org/KDE_PIM'
-license=('GPL' 'LGPL' 'FDL')
-depends=(libkgapi libkolab akonadi-calendar knotifyconfig kross kalarmcal kmbox kimap hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
+pkgver=18.12.2
+pkgrel=1
+pkgrel+=.parabola1
+pkgdesc='Extends the functionality of kdepim'
+pkgdesc+=' (built without nonfree qt5-webengine)'
+arch=(x86_64)
+arch+=(i686 armv7h)
+url='https://kontact.kde.org'
+license=(GPL LGPL FDL)
+depends=(libkolabxml kdav akonadi-calendar knotifyconfig kalarmcal kmbox pimcommon akonadi-notes kdelibs4support)
+makedepends=(extra-cmake-modules kdoctools boost kdesignerplugin qca qt5-networkauth)
+optdepends=('qca: EWS resource' 'qt5-networkauth: EWS resource')
 conflicts=(kio-pim)
 source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
         'libre.patch')
-sha256sums=('e1ad03f80737bc4afaa101f108430b011ad2e2c1349e477a66ce59bc901fac48'
+sha256sums=('b7d5cd9e03688f62f4b36f1867ba681a2ce8d806817d3d2be1c615f07b3f6e45'
             'SKIP'
-            'b98d522c5335692a724b76491e14aedb343301227ff59560381eabf871e6b36f')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
+            '312d76a56e3b39151465a8cd7e96b522f05eb53bac7f7d984fa09858498f4a2b')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   mkdir -p build
@@ -30,10 +35,9 @@ prepare() {
 build() {
   cd build
   cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 }
 
diff --git a/libre/kdepim-runtime/libre.patch b/libre/kdepim-runtime/libre.patch
index 4dbbe4c46..75a7b01db 100644
--- a/libre/kdepim-runtime/libre.patch
+++ b/libre/kdepim-runtime/libre.patch
@@ -1,21 +1,37 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6786adc43..825e6bfaa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,7 +82,7 @@ find_package( SharedMimeInfo REQUIRED )
- 
+diff -rupN kdepim-runtime-18.12.2/CMakeLists.txt kdepim-runtime-18.12.2.new/CMakeLists.txt
+--- kdepim-runtime-18.12.2/CMakeLists.txt	2019-02-05 01:49:01.000000000 +0100
++++ kdepim-runtime-18.12.2.new/CMakeLists.txt	2019-02-26 17:17:24.411619477 +0100
+@@ -98,7 +98,7 @@ set_package_properties(Sasl2 PROPERTIES
+ find_package(Qca-qt5)
  
  # QT5 package
--find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus WebEngineWidgets)
-+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus)
- find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
- if (NOT Qt5TextToSpeech_FOUND)
-     message(STATUS "Qt5TextToSpeech not found, speech feature will be disabled")
-diff --git a/resources/tomboynotes/CMakeLists.txt b/resources/tomboynotes/CMakeLists.txt
-index a49caa91e..97b36a587 100644
---- a/resources/tomboynotes/CMakeLists.txt
-+++ b/resources/tomboynotes/CMakeLists.txt
-@@ -60,7 +60,6 @@ target_link_libraries(akonadi_tomboynotes_resource
+-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus WebEngineWidgets)
++find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus)
+ find_package(Qt5 OPTIONAL_COMPONENTS NetworkAuth)
+ if (NOT Qt5NetworkAuth_FOUND)
+     message(STATUS "Qt5NetworkAuth not found, OAuth2 authentication will not be supported")
+diff -rupN kdepim-runtime-18.12.2/resources/CMakeLists.txt kdepim-runtime-18.12.2.new/resources/CMakeLists.txt
+--- kdepim-runtime-18.12.2/resources/CMakeLists.txt	2019-01-30 08:34:37.000000000 +0100
++++ kdepim-runtime-18.12.2.new/resources/CMakeLists.txt	2019-02-26 17:52:33.024796657 +0100
+@@ -45,7 +45,7 @@ add_subdirectory( imap )
+ if (Libkolabxml_FOUND)
+     add_subdirectory( kolab )
+ endif()
+-add_subdirectory( facebook )
++#add_subdirectory( facebook )
+ add_subdirectory( maildir )
+ 
+ add_subdirectory( openxchange )
+@@ -64,4 +64,4 @@ add_subdirectory( icaldir )
+ add_subdirectory( vcard )
+ add_subdirectory( folderarchivesettings )
+ add_subdirectory( tomboynotes )
+-add_subdirectory( ews )
++#add_subdirectory( ews )
+diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/CMakeLists.txt kdepim-runtime-18.12.2.new/resources/tomboynotes/CMakeLists.txt
+--- kdepim-runtime-18.12.2/resources/tomboynotes/CMakeLists.txt	2019-01-30 08:34:37.000000000 +0100
++++ kdepim-runtime-18.12.2.new/resources/tomboynotes/CMakeLists.txt	2019-02-26 17:16:50.517846453 +0100
+@@ -56,7 +56,6 @@ target_link_libraries(akonadi_tomboynote
      Qt5::DBus
      Qt5::Gui
      Qt5::Network
@@ -23,18 +39,16 @@ index a49caa91e..97b36a587 100644
      KF5::AkonadiAgentBase
      KF5::AkonadiNotes
      KF5::ConfigCore
-diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.cpp b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
-index 00ad110e2..45e3af5e7 100644
---- a/resources/tomboynotes/tomboyserverauthenticatejob.cpp
-+++ b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
-@@ -24,19 +24,15 @@
- #include <QJsonObject>
+diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.cpp kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.cpp
+--- kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.cpp	2019-01-30 08:34:37.000000000 +0100
++++ kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.cpp	2019-02-26 17:42:47.984027404 +0100
+@@ -25,19 +25,14 @@
  
  TomboyServerAuthenticateJob::TomboyServerAuthenticateJob(KIO::AccessManager *manager, QObject *parent)
--    : TomboyJobBase(manager, parent),
--      mWebView(new QWebEngineView(Q_NULLPTR))
-+    : TomboyJobBase(manager, parent)
+     : TomboyJobBase(manager, parent)
+-    , mWebView(new QWebEngineView(nullptr))
  {
+-    mWebView->setContextMenuPolicy(Qt::NoContextMenu);
      // Connect the o2 authenfication signals
      connect(mO1, &O1::linkingFailed, this, &TomboyServerAuthenticateJob::onLinkingFailed);
      connect(mO1, &O1::linkingSucceeded, this, &TomboyServerAuthenticateJob::onLinkingSucceeded);
@@ -48,7 +62,7 @@ index 00ad110e2..45e3af5e7 100644
  }
  
  void TomboyServerAuthenticateJob::start()
-@@ -82,8 +78,6 @@ void TomboyServerAuthenticateJob::onLinkingSucceeded()
+@@ -83,8 +78,6 @@ void TomboyServerAuthenticateJob::onLink
  
  void TomboyServerAuthenticateJob::onOpenBrowser(const QUrl &url)
  {
@@ -57,10 +71,9 @@ index 00ad110e2..45e3af5e7 100644
  }
  
  void TomboyServerAuthenticateJob::onApiRequestFinished()
-diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.h b/resources/tomboynotes/tomboyserverauthenticatejob.h
-index 6743406d1..5a70ae4e6 100644
---- a/resources/tomboynotes/tomboyserverauthenticatejob.h
-+++ b/resources/tomboynotes/tomboyserverauthenticatejob.h
+diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.h kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.h
+--- kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.h	2019-01-30 08:34:37.000000000 +0100
++++ kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.h	2019-02-26 17:19:35.666654616 +0100
 @@ -22,7 +22,6 @@
  
  #include "tomboyjobbase.h"
@@ -69,12 +82,12 @@ index 6743406d1..5a70ae4e6 100644
  
  class TomboyServerAuthenticateJob : public TomboyJobBase
  {
-@@ -48,8 +47,6 @@ private:
+@@ -47,8 +46,6 @@ private:
+     void onApiRequestFinished();
      void onUserRequestFinished();
      QString mUserURL;
- 
--    QWebEngineView *mWebView;
 -
+-    QWebEngineView *mWebView = nullptr;
  };
  
  #endif // TOMBOYSERVERAUTHENTICATEJOB_H