[messagingframework] Sync upstream. Default data path moved. JB#60001

rpm/0001-fix-tests-installation-path.patch

@@ -13,7 +13,7 @@ Subject: [PATCH] fix tests installation path.
  6 files changed, 533 insertions(+), 533 deletions(-)
 
 diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
-index c64f40f9..dfe36bb0 100644
+index 6b79f069..0c29793a 100644
 --- a/benchmarks/tst_messageserver/tst_messageserver.pro
 +++ b/benchmarks/tst_messageserver/tst_messageserver.pro
 @@ -2,7 +2,7 @@ TEMPLATE = app

rpm/0002-Accounts-qt-integration.patch

@@ -198,10 +198,10 @@ index 6c9464c2..a647ade7 100644
 +}
 +}
 diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
-index 657dc74c..5098a24c 100644
+index 46d37bee..239d9d50 100644
 --- a/src/tools/messageserver/servicehandler.cpp
 +++ b/src/tools/messageserver/servicehandler.cpp
-@@ -696,10 +696,23 @@ void ServiceHandler::onAccountsAdded(const QMailAccountIdList &ids)
+@@ -699,10 +699,23 @@ void ServiceHandler::onAccountsAdded(const QMailAccountIdList &ids)
 
  void ServiceHandler::onAccountsUpdated(const QMailAccountIdList &ids)
  {

rpm/0004-Add-keepalive-timer-to-IMAP-IDLE-service.patch

@@ -13,7 +13,7 @@ DEFINES+=USE_KEEPALIVE
  4 files changed, 32 insertions(+)
 
 diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
-index 0e1c7c78..9a00e16a 100644
+index 09955b59..2a9bbaa2 100644
 --- a/src/plugins/messageservices/imap/imap.pro
 +++ b/src/plugins/messageservices/imap/imap.pro
 @@ -6,6 +6,10 @@ load(qt_plugin)
@@ -28,7 +28,7 @@ index 0e1c7c78..9a00e16a 100644
             imapconfiguration.h \
             imaplog.h \
 diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp
-index 7d13083c..fcd80f79 100644
+index 52652235..0d244ad8 100644
 --- a/src/plugins/messageservices/imap/imapclient.cpp
 +++ b/src/plugins/messageservices/imap/imapclient.cpp
 @@ -431,9 +431,15 @@ ImapClient::ImapClient(const QMailAccountId &id, QObject* parent)
@@ -47,7 +47,7 @@ index 7d13083c..fcd80f79 100644
 
      connect(QMailMessageBuffer::instance(), SIGNAL(flushed()), this, SLOT(messageBufferFlushed()));
 
-@@ -1626,10 +1632,16 @@ bool ImapClient::isPushEmailEstablished()
+@@ -1622,10 +1628,16 @@ bool ImapClient::isPushEmailEstablished()
 
  void ImapClient::setIdlingForFolder(const QMailFolderId &id)
  {
@@ -64,7 +64,7 @@ index 7d13083c..fcd80f79 100644
      if (!_waitingForIdleFolderIds.isEmpty()) {
          _waitingForIdleFolderIds.removeOne(id);
          if (_waitingForIdleFolderIds.isEmpty()) {
-@@ -1659,7 +1671,11 @@ void ImapClient::monitor(const QMailFolderIdList &mailboxIds)
+@@ -1655,7 +1667,11 @@ void ImapClient::monitor(const QMailFolderIdList &mailboxIds)
      static int count(0);
 
      if (mailboxIds.isEmpty()) {

rpm/0005-Use-Qt5-booster-to-save-memory.patch

@@ -25,11 +25,11 @@ index 68426c6e..1c93d7b8 100644
  #ifdef USE_HTML_PARSER
      // Need for html parsing by <QTextdocument> in qmailmessage.cpp, but don't need real UI
 diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
-index c0773f31..b11cf134 100644
+index 1ecfbdf6..6c763575 100644
 --- a/src/tools/messageserver/messageserver.pro
 +++ b/src/tools/messageserver/messageserver.pro
-@@ -11,6 +11,13 @@ contains(DEFINES, USE_HTML_PARSER) {
-     QT += gui widgets
+@@ -7,6 +7,13 @@ contains(DEFINES, USE_HTML_PARSER) {
+     QT += gui
  }
 
 +packagesExist(qt5-boostable) {

rpm/0006-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch

@@ -9,13 +9,13 @@ and activate/deactivate IMAP IDLE.
 ---
  src/plugins/messageservices/imap/imap.pro     |  1 +
  .../imap/imapconfiguration.cpp                |  4 +--
- .../messageservices/imap/imapservice.cpp      | 29 +++++++++++++++++++
+ .../messageservices/imap/imapservice.cpp      | 28 +++++++++++++++++++
  .../messageservices/imap/imapservice.h        |  2 ++
  src/tools/systemd/messageserver5.service      |  2 +-
- 5 files changed, 35 insertions(+), 3 deletions(-)
+ 5 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
-index 9a00e16a..0fd8db32 100644
+index 2a9bbaa2..a6e5199f 100644
 --- a/src/plugins/messageservices/imap/imap.pro
 +++ b/src/plugins/messageservices/imap/imap.pro
 @@ -5,6 +5,7 @@ PLUGIN_CLASS_NAME = QmfImapPlugin
@@ -49,10 +49,10 @@ index 4192d1f0..b484b737 100644
 
  void ImapConfigurationEditor::setBaseFolder(const QString &s)
 diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp
-index f4f0d1dd..8bb6e911 100644
+index c432216e..5e0894e7 100644
 --- a/src/plugins/messageservices/imap/imapservice.cpp
 +++ b/src/plugins/messageservices/imap/imapservice.cpp
-@@ -46,6 +46,10 @@
+@@ -44,6 +44,10 @@
  #include <QCoreApplication>
  #include <typeinfo>
 
@@ -63,7 +63,7 @@ index f4f0d1dd..8bb6e911 100644
  namespace {
 
  const QString serviceKey("imap4");
-@@ -1416,6 +1420,13 @@ ImapService::ImapService(const QMailAccountId &accountId)
+@@ -1414,6 +1418,13 @@ ImapService::ImapService(const QMailAccountId &accountId)
      connect(_restartPushEmailTimer, SIGNAL(timeout()), this, SLOT(restartPushEmail()));
      connect(QMailStore::instance(), SIGNAL(accountsUpdated(const QMailAccountIdList&)),
              this, SLOT(accountsUpdated(const QMailAccountIdList&)));
@@ -77,7 +77,7 @@ index f4f0d1dd..8bb6e911 100644
  }
 
  void ImapService::enable()
-@@ -1788,6 +1799,24 @@ void ImapService::setPersistentConnectionStatus(bool status)
+@@ -1786,6 +1797,23 @@ void ImapService::setPersistentConnectionStatus(bool status)
      _idling = status;
  }
 
@@ -98,12 +98,11 @@ index f4f0d1dd..8bb6e911 100644
 +        }
 +    }
 +}
-+
- class ImapConfigurator : public QMailMessageServiceConfigurator
- {
- public:
+
+ ImapServicePlugin::ImapServicePlugin()
+     : QMailMessageServicePlugin()
 diff --git a/src/plugins/messageservices/imap/imapservice.h b/src/plugins/messageservices/imap/imapservice.h
-index 5adb68a5..7795ed50 100644
+index 727c2b0f..8557b710 100644
 --- a/src/plugins/messageservices/imap/imapservice.h
 +++ b/src/plugins/messageservices/imap/imapservice.h
 @@ -75,6 +75,8 @@ protected slots:

rpm/0008-Retrieve-message-lists-based-on-the-folder-sync-poli.patch

@@ -144,10 +144,10 @@ index 5396aa96..7ae52514 100644
      void setStatus(quint64 newStatus);
      void setStatus(quint64 mask, bool set);
 diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp
-index 8bb6e911..32b0a495 100644
+index 5e0894e7..8660ea1e 100644
 --- a/src/plugins/messageservices/imap/imapservice.cpp
 +++ b/src/plugins/messageservices/imap/imapservice.cpp
-@@ -217,7 +217,7 @@ bool ImapService::Source::retrieveFolderList(const QMailAccountId &accountId, co
+@@ -215,7 +215,7 @@ bool ImapService::Source::retrieveFolderList(const QMailAccountId &accountId, co
      _service->_client->strategyContext()->foldersOnlyStrategy.setBase(folderId);
      _service->_client->strategyContext()->foldersOnlyStrategy.setQuickList(!folderId.isValid());
      _service->_client->strategyContext()->foldersOnlyStrategy.setDescending(descending);
@@ -156,7 +156,7 @@ index 8bb6e911..32b0a495 100644
      appendStrategy(&_service->_client->strategyContext()->foldersOnlyStrategy);
      if (!_unavailable)
          return initiateStrategy();
-@@ -292,6 +292,9 @@ bool ImapService::Source::doRetrieveMessageLists(const QMailAccountId &accountId
+@@ -290,6 +290,9 @@ bool ImapService::Source::doRetrieveMessageLists(const QMailAccountId &accountId
          qCWarning(lcIMAP) << "IMAP Search sorting not yet implemented!";
      }
 
@@ -166,7 +166,7 @@ index 8bb6e911..32b0a495 100644
      QMailFolderIdList folderIds;
      uint adjustedMinimum = minimum ? minimum : INT_MAX; // zero means retrieve all mail
      _service->_client->strategyContext()->retrieveMessageListStrategy.clearSelection();
-@@ -311,7 +314,7 @@ bool ImapService::Source::doRetrieveMessageLists(const QMailAccountId &accountId
+@@ -309,7 +312,7 @@ bool ImapService::Source::doRetrieveMessageLists(const QMailAccountId &accountId
 
      _service->_client->strategyContext()->retrieveMessageListStrategy.setOperation(_service->_client->strategyContext(), QMailRetrievalAction::Auto);
      _service->_client->strategyContext()->retrieveMessageListStrategy.selectedFoldersAppend(folderIds);
@@ -275,18 +275,18 @@ index aa56889c..b73b32be 100644
      uint _total;
  };
 diff --git a/src/plugins/messageservices/pop/popservice.cpp b/src/plugins/messageservices/pop/popservice.cpp
-index c5f1cfb5..a466312a 100644
+index 7eeb3868..43cc6ae4 100644
 --- a/src/plugins/messageservices/pop/popservice.cpp
 +++ b/src/plugins/messageservices/pop/popservice.cpp
-@@ -102,6 +102,7 @@ private:
+@@ -100,6 +100,7 @@ private:
      bool _unavailable;
      bool _mailCheckQueued;
      bool _queuedMailCheckInProgress;
 +    QMailAccount::FolderSyncPolicy _folderSyncPolicy;
      QTimer _intervalTimer;
  };
 
-@@ -144,6 +145,9 @@ bool PopService::Source::retrieveMessageList(const QMailAccountId &accountId, co
+@@ -142,6 +143,9 @@ bool PopService::Source::retrieveMessageList(const QMailAccountId &accountId, co
          return false;
      }
 
@@ -296,7 +296,7 @@ index c5f1cfb5..a466312a 100644
      QMailMessageKey countKey(QMailMessageKey::parentAccountId(accountId));
      countKey &= ~QMailMessageKey::status(QMailMessage::Temporary);
      uint existing = QMailStore::instance()->countMessages(countKey);
-@@ -212,6 +216,9 @@ bool PopService::Source::synchronize(const QMailAccountId &accountId)
+@@ -210,6 +214,9 @@ bool PopService::Source::synchronize(const QMailAccountId &accountId)
          return false;
      }
 

rpm/0012-Revert-Fix-bundled-zlib-detection.patch

@@ -12,12 +12,12 @@ qt gets updated.
  1 file changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
-index 0fd8db32..4a47f3dd 100644
+index a6e5199f..073883d7 100644
 --- a/src/plugins/messageservices/imap/imap.pro
 +++ b/src/plugins/messageservices/imap/imap.pro
-@@ -52,9 +52,17 @@ SOURCES += imapclient.cpp \
-     RESOURCES += imap.qrc
- }
+@@ -38,9 +38,17 @@ SOURCES += imapclient.cpp \
+            serviceactionqueue.cpp \
+            idlenetworksession.cpp
 
 -qtConfig(system-zlib) {
 -    QMAKE_USE_PRIVATE += zlib

rpm/0013-Revert-Use-QRandomGenerator-instead-of-qrand.patch

@@ -79,7 +79,7 @@ index cb75f987..96b538e6 100644
          if (r>57) r+=7;
          if (r>90) r+=6;
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index 85022682..3dc6dd83 100644
+index f437a0c7..347f7165 100644
 --- a/src/plugins/messageservices/smtp/smtpclient.cpp
 +++ b/src/plugins/messageservices/smtp/smtpclient.cpp
 @@ -42,7 +42,6 @@