libre/kdepim-runtime: updated to 18.12.2

1 files changed, 46 insertions, 33 deletions

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