diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-09-07 00:29:20 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-09-07 00:29:20 +0000 |
| commit | f2ff1b7a03e95a4f898ebe9b9c9ef0f3f44b2cd8 (patch) | |
| tree | 5d3361237a9fcce6456a2f3fc3173450aff57a3c /freefilesync/00_allow_parallel_ops.patch | |
| parent | Merge branch 'xdgmenumaker-bump' into 'master' (diff) | |
| parent | ffs: fix libcurl-7.61.1 patch for el8 (diff) | |
| download | stackrpms-f2ff1b7a03e95a4f898ebe9b9c9ef0f3f44b2cd8.tar.gz stackrpms-f2ff1b7a03e95a4f898ebe9b9c9ef0f3f44b2cd8.tar.bz2 stackrpms-f2ff1b7a03e95a4f898ebe9b9c9ef0f3f44b2cd8.zip | |
Merge branch 'freefilesync-bump' into 'master'
freefilesync 11.23
See merge request bgstack15/stackrpms!315
Diffstat (limited to 'freefilesync/00_allow_parallel_ops.patch')
| -rw-r--r-- | freefilesync/00_allow_parallel_ops.patch | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/freefilesync/00_allow_parallel_ops.patch b/freefilesync/00_allow_parallel_ops.patch index 65226bb..dfe2c55 100644 --- a/freefilesync/00_allow_parallel_ops.patch +++ b/freefilesync/00_allow_parallel_ops.patch @@ -1,10 +1,9 @@ Version: 11.22 Date: 2022-06-26 Message: The source release appears not to actually include the logic that performs operations in parallel, so this patch doesn't actually do anything. -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 @@ +--- a/FreeFileSync/Source/ui/folder_selector.cpp ++++ b/FreeFileSync/Source/ui/folder_selector.cpp +@@ -263,7 +263,7 @@ void FolderSelector::onSelectFolder(wxCo void FolderSelector::onSelectAltFolder(wxCommandEvent& event) { Zstring folderPathPhrase = getPath(); @@ -13,10 +12,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/fold if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, static_cast<bool>(setDeviceParallelOps_)) != ConfirmationButton::accept) return; -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 @@ +--- a/FreeFileSync/Source/ui/small_dlgs.cpp ++++ b/FreeFileSync/Source/ui/small_dlgs.cpp +@@ -371,11 +371,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p m_spinCtrlConnectionCount->SetValue(parallelOps); @@ -35,7 +33,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/smal //--------------------------------------------------------- //set up default view for dialog size calculation -@@ -807,7 +810,7 @@ +@@ -821,7 +824,7 @@ CopyToDialog::CopyToDialog(wxWindow* par targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath, targetFolderLastSelected, sftpKeyFileLastSelected, nullptr /*staticText*/, nullptr /*wxWindow*/, nullptr /*droppedPathsFilter*/, @@ -44,10 +42,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/smal 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.22-0/FreeFileSync/Source/ui/sync_cfg.cpp 2022-06-26 12:01:15.638291465 -0400 -+++ 11.22-1/FreeFileSync/Source/ui/sync_cfg.cpp 2022-06-26 12:42:38.181161442 -0400 -@@ -352,7 +352,7 @@ +--- a/FreeFileSync/Source/ui/sync_cfg.cpp ++++ b/FreeFileSync/Source/ui/sync_cfg.cpp +@@ -352,7 +352,7 @@ emailHistoryOut_(emailHistory), commandHistoryOut_(commandHistory), globalPairCfg_(globalPairCfg), localPairCfg_(localPairCfg), @@ -56,4 +53,3 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/sync showMultipleCfgs_(showMultipleCfgs), globalLogFolderPhrase_(globalLogFolderPhrase) { - |