summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-04-05 19:55:26 +0000
committerB. Stack <bgstack15@gmail.com>2021-04-05 19:55:26 +0000
commit8cdfe5628a251300730e52fbbef57b14f157ed36 (patch)
tree7a2c6dc8e511d9d953bd09082e39dcd6638d264a /freefilesync/debian/patches/ffs_allow_parallel_ops.patch
parentMerge branch 'palemoon-bump' into 'master' (diff)
parent11.9 rc1 (diff)
downloadstackrpms-8cdfe5628a251300730e52fbbef57b14f157ed36.tar.gz
stackrpms-8cdfe5628a251300730e52fbbef57b14f157ed36.tar.bz2
stackrpms-8cdfe5628a251300730e52fbbef57b14f157ed36.zip
Merge branch 'freefilesync-bump' into 'master'
ffs 11.9 See merge request bgstack15/stackrpms!232
Diffstat (limited to 'freefilesync/debian/patches/ffs_allow_parallel_ops.patch')
-rw-r--r--freefilesync/debian/patches/ffs_allow_parallel_ops.patch13
1 files changed, 1 insertions, 12 deletions
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index 3d00225..90bd831 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -1,16 +1,5 @@
+Last version tested: 11.9
This is still experimental.
-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
-
- 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
bgstack15