summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2021-04-05 11:25:53 -0400
committerB Stack <bgstack15@gmail.com>2021-04-05 11:25:53 -0400
commit2af91444647d7721e9a7ec447e23785ced218008 (patch)
treeb5355b215b6390c946dba288134f7fcfb81a1d21 /freefilesync/debian/patches
parentMerge branch 'makemkv-bump' into 'master' (diff)
downloadstackrpms-2af91444647d7721e9a7ec447e23785ced218008.tar.gz
stackrpms-2af91444647d7721e9a7ec447e23785ced218008.tar.bz2
stackrpms-2af91444647d7721e9a7ec447e23785ced218008.zip
11.9 rc1
Diffstat (limited to 'freefilesync/debian/patches')
-rw-r--r--freefilesync/debian/patches/ffs_allow_parallel_ops.patch13
-rw-r--r--freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch8
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?
bgstack15