diff options
author | B. Stack <bgstack15@gmail.com> | 2021-08-23 14:11:56 +0000 |
---|---|---|
committer | B. Stack <bgstack15@gmail.com> | 2021-08-23 14:11:56 +0000 |
commit | 5640934913057637b0461c5ecf7c9d44a75609a0 (patch) | |
tree | 4eac4527e9a708668b93c0473cdc4cef8c79d48d /freefilesync/debian/patches/ffs_allow_parallel_ops.patch | |
parent | Merge branch 'newmoon-bump' into 'master' (diff) | |
parent | Freefilesync 11.13 (diff) | |
download | stackrpms-5640934913057637b0461c5ecf7c9d44a75609a0.tar.gz stackrpms-5640934913057637b0461c5ecf7c9d44a75609a0.tar.bz2 stackrpms-5640934913057637b0461c5ecf7c9d44a75609a0.zip |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.13
See merge request bgstack15/stackrpms!256
Diffstat (limited to 'freefilesync/debian/patches/ffs_allow_parallel_ops.patch')
-rw-r--r-- | freefilesync/debian/patches/ffs_allow_parallel_ops.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch index 90bd831..473ae46 100644 --- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch +++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch @@ -1,5 +1,5 @@ -Last version tested: 11.9 -This is still experimental. +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. 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,15 +44,14 @@ 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.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 @@ +--- 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 @@ commandHistoryOut_(commandHistory), globalPairCfg_(globalPairCfg), - localPairCfg_(localPairConfig), + localPairCfg_(localPairCfg), - enableExtraFeatures_(false), + enableExtraFeatures_(true), showMultipleCfgs_(showMultipleCfgs) { setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); - |