libre.patch 4.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. diff -rupN kdepim-runtime-18.12.2/CMakeLists.txt kdepim-runtime-18.12.2.new/CMakeLists.txt
  2. --- kdepim-runtime-18.12.2/CMakeLists.txt 2019-02-05 01:49:01.000000000 +0100
  3. +++ kdepim-runtime-18.12.2.new/CMakeLists.txt 2019-02-26 17:17:24.411619477 +0100
  4. @@ -98,7 +98,7 @@ set_package_properties(Sasl2 PROPERTIES
  5. find_package(Qca-qt5)
  6. # QT5 package
  7. -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus WebEngineWidgets)
  8. +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus)
  9. find_package(Qt5 OPTIONAL_COMPONENTS NetworkAuth)
  10. if (NOT Qt5NetworkAuth_FOUND)
  11. message(STATUS "Qt5NetworkAuth not found, OAuth2 authentication will not be supported")
  12. diff -rupN kdepim-runtime-18.12.2/resources/CMakeLists.txt kdepim-runtime-18.12.2.new/resources/CMakeLists.txt
  13. --- kdepim-runtime-18.12.2/resources/CMakeLists.txt 2019-01-30 08:34:37.000000000 +0100
  14. +++ kdepim-runtime-18.12.2.new/resources/CMakeLists.txt 2019-02-26 17:52:33.024796657 +0100
  15. @@ -45,7 +45,7 @@ add_subdirectory( imap )
  16. if (Libkolabxml_FOUND)
  17. add_subdirectory( kolab )
  18. endif()
  19. -add_subdirectory( facebook )
  20. +#add_subdirectory( facebook )
  21. add_subdirectory( maildir )
  22. add_subdirectory( openxchange )
  23. @@ -64,4 +64,4 @@ add_subdirectory( icaldir )
  24. add_subdirectory( vcard )
  25. add_subdirectory( folderarchivesettings )
  26. add_subdirectory( tomboynotes )
  27. -add_subdirectory( ews )
  28. +#add_subdirectory( ews )
  29. diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/CMakeLists.txt kdepim-runtime-18.12.2.new/resources/tomboynotes/CMakeLists.txt
  30. --- kdepim-runtime-18.12.2/resources/tomboynotes/CMakeLists.txt 2019-01-30 08:34:37.000000000 +0100
  31. +++ kdepim-runtime-18.12.2.new/resources/tomboynotes/CMakeLists.txt 2019-02-26 17:16:50.517846453 +0100
  32. @@ -56,7 +56,6 @@ target_link_libraries(akonadi_tomboynote
  33. Qt5::DBus
  34. Qt5::Gui
  35. Qt5::Network
  36. - Qt5::WebEngineWidgets
  37. KF5::AkonadiAgentBase
  38. KF5::AkonadiNotes
  39. KF5::ConfigCore
  40. diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.cpp kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.cpp
  41. --- kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.cpp 2019-01-30 08:34:37.000000000 +0100
  42. +++ kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.cpp 2019-02-26 17:42:47.984027404 +0100
  43. @@ -25,19 +25,14 @@
  44. TomboyServerAuthenticateJob::TomboyServerAuthenticateJob(KIO::AccessManager *manager, QObject *parent)
  45. : TomboyJobBase(manager, parent)
  46. - , mWebView(new QWebEngineView(nullptr))
  47. {
  48. - mWebView->setContextMenuPolicy(Qt::NoContextMenu);
  49. // Connect the o2 authenfication signals
  50. connect(mO1, &O1::linkingFailed, this, &TomboyServerAuthenticateJob::onLinkingFailed);
  51. connect(mO1, &O1::linkingSucceeded, this, &TomboyServerAuthenticateJob::onLinkingSucceeded);
  52. - connect(mO1, &O1::openBrowser, this, &TomboyServerAuthenticateJob::onOpenBrowser);
  53. - connect(mO1, &O1::closeBrowser, mWebView, &QWebEngineView::close);
  54. }
  55. TomboyServerAuthenticateJob::~TomboyServerAuthenticateJob()
  56. {
  57. - delete mWebView;
  58. }
  59. void TomboyServerAuthenticateJob::start()
  60. @@ -83,8 +78,6 @@ void TomboyServerAuthenticateJob::onLink
  61. void TomboyServerAuthenticateJob::onOpenBrowser(const QUrl &url)
  62. {
  63. - mWebView->setUrl(url);
  64. - mWebView->show();
  65. }
  66. void TomboyServerAuthenticateJob::onApiRequestFinished()
  67. diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.h kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.h
  68. --- kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.h 2019-01-30 08:34:37.000000000 +0100
  69. +++ kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.h 2019-02-26 17:19:35.666654616 +0100
  70. @@ -22,7 +22,6 @@
  71. #include "tomboyjobbase.h"
  72. #include <QString>
  73. -#include <QWebEngineView>
  74. class TomboyServerAuthenticateJob : public TomboyJobBase
  75. {
  76. @@ -47,8 +46,6 @@ private:
  77. void onApiRequestFinished();
  78. void onUserRequestFinished();
  79. QString mUserURL;
  80. -
  81. - QWebEngineView *mWebView = nullptr;
  82. };
  83. #endif // TOMBOYSERVERAUTHENTICATEJOB_H