Merge branch 'freefilesync-bump' into 'master'

FreeFileSync 11.4

See merge request bgstack15/stackrpms!206

1 files changed, 56 insertions, 13 deletions

diff --git a/freefilesync/ffs_allow_parallel_ops.patch b/freefilesync/ffs_allow_parallel_ops.patch
index 040369f..3d00225 100644
--- a/freefilesync/ffs_allow_parallel_ops.patch
+++ b/freefilesync/ffs_allow_parallel_ops.patch
@@ -1,20 +1,63 @@
 This is still experimental.
-diff -aur 11.2-0/FreeFileSync/Source/ui/folder_selector.cpp 11.2-1/FreeFileSync/Source/ui/folder_selector.cpp
---- 11.2-0/FreeFileSync/Source/ui/folder_selector.cpp	2020-10-02 14:39:05.297463367 -0400
-+++ 11.2-1/FreeFileSync/Source/ui/folder_selector.cpp	2020-10-02 15:01:06.505758389 -0400
-@@ -260,7 +260,7 @@
+diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/config.cpp 11.4-1/FreeFileSync/Source/config.cpp
+--- 11.4-0/FreeFileSync/Source/config.cpp	2020-12-08 08:15:29.428156465 -0500
++++ 11.4-1/FreeFileSync/Source/config.cpp	2020-12-08 19:12:03.373121599 -0500
+@@ -1200,7 +1200,7 @@
+     }
+     else
+     {
+-        size_t parallelOps = 1;
++        size_t parallelOps = 5;
+         if (const XmlElement* e = in["VersioningFolder"].get()) e->getAttribute("Threads", parallelOps); //try to get attribute
  
-     std::optional<std::wstring> parallelOpsDisabledReason;
- 
--        parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition");
-+    //  parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition");
+         const size_t parallelOpsPrev = getDeviceParallelOps(deviceParallelOps, syncCfg.versioningFolderPhrase);
+diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp
+--- 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 08:15:29.428156465 -0500
++++ 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 19:12:09.205183330 -0500
+@@ -256,7 +256,7 @@
+ void FolderSelector::onSelectAltFolder(wxCommandEvent& event)
+ {
+     Zstring folderPathPhrase = getPath();
+-    size_t parallelOps = getDeviceParallelOps_ ? getDeviceParallelOps_(folderPathPhrase) : 1;
++    size_t parallelOps = getDeviceParallelOps_ ? getDeviceParallelOps_(folderPathPhrase) : 5;
  
-     if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, get(parallelOpsDisabledReason)) != ConfirmationButton::accept)
+     if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, static_cast<bool>(setDeviceParallelOps_)) != ConfirmationButton::accept)
          return;
-diff -aur 11.2-0/FreeFileSync/Source/ui/sync_cfg.cpp 11.2-1/FreeFileSync/Source/ui/sync_cfg.cpp
---- 11.2-0/FreeFileSync/Source/ui/sync_cfg.cpp	2020-10-02 14:39:05.289463269 -0400
-+++ 11.2-1/FreeFileSync/Source/ui/sync_cfg.cpp	2020-10-02 15:01:06.509758438 -0400
-@@ -336,7 +336,7 @@
+diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp	2020-12-08 08:15:29.432156507 -0500
++++ 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp	2020-12-08 19:07:22.970153675 -0500
+@@ -370,11 +370,14 @@
+ 
+     m_spinCtrlConnectionCount->SetValue(parallelOps);
+ 
+-    m_spinCtrlConnectionCount->Disable();
+-    m_staticTextConnectionCountDescr->Hide();
++    if (!canChangeParallelOp)
++    {
++        m_spinCtrlConnectionCount->Disable();
++        m_staticTextConnectionCountDescr->Hide();
+ 
+-    m_spinCtrlChannelCountSftp->Disable();
+-    m_buttonChannelCountSftp  ->Disable();
++        m_spinCtrlChannelCountSftp->Disable();
++        m_buttonChannelCountSftp  ->Disable();
++    }
+     //---------------------------------------------------------
+ 
+     //set up default view for dialog size calculation
+@@ -807,7 +810,7 @@
+ 
+     targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath,
+                                                     targetFolderLastSelected, sftpKeyFileLastSelected, nullptr /*staticText*/, nullptr /*wxWindow*/, nullptr /*droppedPathsFilter*/,
+-    [](const Zstring& folderPathPhrase) { return 1; } /*getDeviceParallelOps*/, nullptr /*setDeviceParallelOps*/);
++    [](const Zstring& folderPathPhrase) { return 5; } /*getDeviceParallelOps*/, nullptr /*setDeviceParallelOps*/);
+ 
+     m_targetFolderPath->setHistory(std::make_shared<HistoryList>(folderHistory, folderHistoryMax));
+ 
+diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/sync_cfg.cpp 11.4-1/FreeFileSync/Source/ui/sync_cfg.cpp
+--- 11.4-0/FreeFileSync/Source/ui/sync_cfg.cpp	2020-12-08 08:15:29.432156507 -0500
++++ 11.4-1/FreeFileSync/Source/ui/sync_cfg.cpp	2020-12-08 18:31:29.079355828 -0500
+@@ -333,7 +333,7 @@
  commandHistoryOut_(commandHistory),
  globalPairCfg_(globalPairCfg),
  localPairCfg_(localPairConfig),