summaryrefslogtreecommitdiff
path: root/freefilesync/00_allow_parallel_ops.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-06-27 11:13:49 -0400
committerB. Stack <bgstack15@gmail.com>2022-06-27 11:13:49 -0400
commit83c49830d173c2f763960417221d9826ec4add94 (patch)
tree744d5d5a840cc83203450b6b4838596003249752 /freefilesync/00_allow_parallel_ops.patch
parentmerge freefilesync-bump into freefilesync-el8 (diff)
downloadstackrpms-83c49830d173c2f763960417221d9826ec4add94.tar.gz
stackrpms-83c49830d173c2f763960417221d9826ec4add94.tar.bz2
stackrpms-83c49830d173c2f763960417221d9826ec4add94.zip
ffs 11.22 rpm rc1
Diffstat (limited to 'freefilesync/00_allow_parallel_ops.patch')
-rw-r--r--freefilesync/00_allow_parallel_ops.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/freefilesync/00_allow_parallel_ops.patch b/freefilesync/00_allow_parallel_ops.patch
index 473ae46..65226bb 100644
--- a/freefilesync/00_allow_parallel_ops.patch
+++ b/freefilesync/00_allow_parallel_ops.patch
@@ -1,5 +1,6 @@
-Last version tested: 11.13
-The source release appears not to actually include the logic that performs operations in parallel, so this patch doesn't actually do anything.
+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
@@ -44,14 +45,15 @@ 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.13-0/FreeFileSync/Source/ui/sync_cfg.cpp 2021-08-17 19:18:02.039992429 -0400
-+++ 11.13-1/FreeFileSync/Source/ui/sync_cfg.cpp 2021-08-17 19:33:01.693071327 -0400
-@@ -348,7 +348,7 @@
+--- 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 @@
commandHistoryOut_(commandHistory),
globalPairCfg_(globalPairCfg),
localPairCfg_(localPairCfg),
- enableExtraFeatures_(false),
+ enableExtraFeatures_(true),
- showMultipleCfgs_(showMultipleCfgs)
+ showMultipleCfgs_(showMultipleCfgs),
+ globalLogFolderPhrase_(globalLogFolderPhrase)
{
- setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
+
bgstack15