diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-04-05 19:55:26 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-04-05 19:55:26 +0000 |
| commit | 8cdfe5628a251300730e52fbbef57b14f157ed36 (patch) | |
| tree | 7a2c6dc8e511d9d953bd09082e39dcd6638d264a /freefilesync/debian/patches | |
| parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
| parent | 11.9 rc1 (diff) | |
| download | stackrpms-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')
| -rw-r--r-- | freefilesync/debian/patches/ffs_allow_parallel_ops.patch | 13 | ||||
| -rw-r--r-- | freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch | 8 |
2 files changed, 5 insertions, 16 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 diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index 30146b7..6cae409 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -156,11 +156,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu { SetLabel(label); diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h ---- 11.6-0/wx+/dc.h 2021-02-02 11:37:38.777718874 -0500 -+++ 11.6-1/wx+/dc.h 2021-02-02 13:05:02.297177154 -0500 -@@ -68,9 +68,6 @@ +--- 11.9-0/wx+/dc.h 2021-04-05 10:57:36.518697734 -0400 ++++ 11.9-1/wx+/dc.h 2021-04-05 11:11:21.809650868 -0400 +@@ -69,9 +69,6 @@ inline - int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) + int getDPI() { -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS -#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined? |