libre.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. diff -Naurp1 a/CMakeLists.txt b/CMakeLists.txt
  2. --- a/CMakeLists.txt 2020-11-03 06:46:42.000000000 +0600
  3. +++ b/CMakeLists.txt 2020-11-10 21:50:39.918988711 +0600
  4. @@ -103,3 +103,3 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable a
  5. # QT5 package
  6. -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus WebEngineWidgets NetworkAuth)
  7. +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus NetworkAuth)
  8. diff -Naurp1 a/resources/CMakeLists.txt b/resources/CMakeLists.txt
  9. --- a/resources/CMakeLists.txt 2020-10-17 13:34:03.000000000 +0600
  10. +++ b/resources/CMakeLists.txt 2020-11-10 21:53:09.888981748 +0600
  11. @@ -47,4 +47,2 @@ endif()
  12. -#Disable it as it seems Facebook disabled the login and event API has been crippled
  13. -#add_subdirectory( facebook )
  14. add_subdirectory( maildir )
  15. @@ -65,2 +63 @@ add_subdirectory( folderarchivesettings
  16. add_subdirectory( tomboynotes )
  17. -add_subdirectory( ews )
  18. diff -Naurp1 a/resources/tomboynotes/CMakeLists.txt b/resources/tomboynotes/CMakeLists.txt
  19. --- a/resources/tomboynotes/CMakeLists.txt 2020-10-17 13:34:03.000000000 +0600
  20. +++ b/resources/tomboynotes/CMakeLists.txt 2020-11-10 21:53:31.696980735 +0600
  21. @@ -67,3 +67,2 @@ target_link_libraries(akonadi_tomboynote
  22. Qt5::Network
  23. - Qt5::WebEngineWidgets
  24. KF5::AkonadiAgentBase
  25. diff -Naurp1 a/resources/tomboynotes/tomboyserverauthenticatejob.cpp b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
  26. --- a/resources/tomboynotes/tomboyserverauthenticatejob.cpp 2020-10-17 13:34:03.000000000 +0600
  27. +++ b/resources/tomboynotes/tomboyserverauthenticatejob.cpp 2020-11-10 21:55:11.354976108 +0600
  28. @@ -27,5 +27,3 @@ TomboyServerAuthenticateJob::TomboyServe
  29. : TomboyJobBase(manager, parent)
  30. - , mWebView(new QWebEngineView(nullptr))
  31. {
  32. - mWebView->setContextMenuPolicy(Qt::NoContextMenu);
  33. // Connect the o2 authenfication signals
  34. @@ -33,4 +31,2 @@ TomboyServerAuthenticateJob::TomboyServe
  35. connect(mO1, &O1::linkingSucceeded, this, &TomboyServerAuthenticateJob::onLinkingSucceeded);
  36. - connect(mO1, &O1::openBrowser, this, &TomboyServerAuthenticateJob::onOpenBrowser);
  37. - connect(mO1, &O1::closeBrowser, mWebView, &QWebEngineView::close);
  38. }
  39. @@ -39,3 +35,2 @@ TomboyServerAuthenticateJob::~TomboyServ
  40. {
  41. - delete mWebView;
  42. }
  43. @@ -85,4 +80,2 @@ void TomboyServerAuthenticateJob::onOpen
  44. {
  45. - mWebView->setUrl(url);
  46. - mWebView->show();
  47. }
  48. diff -Naurp1 a/resources/tomboynotes/tomboyserverauthenticatejob.h b/resources/tomboynotes/tomboyserverauthenticatejob.h
  49. --- a/resources/tomboynotes/tomboyserverauthenticatejob.h 2020-10-17 13:34:03.000000000 +0600
  50. +++ b/resources/tomboynotes/tomboyserverauthenticatejob.h 2020-11-10 21:55:41.780974696 +0600
  51. @@ -24,3 +24,2 @@
  52. #include <QString>
  53. -#include <QWebEngineView>
  54. @@ -49,4 +48,2 @@ private:
  55. QString mUserURL;
  56. -
  57. - QWebEngineView *mWebView = nullptr;
  58. };