ffs 11.6 rc1

3 files changed, 18 insertions, 16 deletions

diff --git a/freefilesync/debian/patches/ffs_sftp.patch b/freefilesync/debian/patches/ffs_sftp.patch
index 09e6655..a51acc8 100644
--- a/freefilesync/debian/patches/ffs_sftp.patch
+++ b/freefilesync/debian/patches/ffs_sftp.patch
@@ -1,13 +1,14 @@
 Source: <none>
 Author: B Stack
 Message: The upstream author observed that some of the values he uses are not in the libssh2 public headers. I don't know where he uses them from, but I had to replace them here to get this to compile.
-Date: 2019-02-11T12:15:59Z
+Date: 2021-02-02T18:08:53Z
+Version: 11.6
 https://github.com/libssh2/libssh2/issues/90
-diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/afs/sftp.cpp 10.24-1/FreeFileSync/Source/afs/sftp.cpp
---- 10.24-0/FreeFileSync/Source/afs/sftp.cpp	2020-05-17 11:01:12.821889929 -0400
-+++ 10.24-1/FreeFileSync/Source/afs/sftp.cpp	2020-05-17 11:37:50.229446467 -0400
-@@ -63,10 +63,10 @@
-                                             LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH;
+diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/FreeFileSync/Source/afs/sftp.cpp 11.6-1/FreeFileSync/Source/afs/sftp.cpp
+--- 11.6-0/FreeFileSync/Source/afs/sftp.cpp	2021-02-02 11:37:38.589717171 -0500
++++ 11.6-1/FreeFileSync/Source/afs/sftp.cpp	2021-02-02 13:06:45.782113785 -0500
+@@ -66,10 +66,10 @@
+                                             LIBSSH2_SFTP_S_IRWXO;
  
  //attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval
 -
@@ -21,3 +22,4 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/afs/sf
  
  /* Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file:
  
+
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch
index e5c4a14..e7e0952 100644
--- a/freefilesync/debian/patches/ffs_traditional_view.patch
+++ b/freefilesync/debian/patches/ffs_traditional_view.patch
@@ -1,5 +1,5 @@
-Version: 11.5
-Date: 2021-01-04
+Version: 11.6
+Date: 2021-02-02
 Author: bgstack15@gmail.com
 Message: restore a traditional view to FreeFileSync
 diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.3-1/FreeFileSync/Source/ui/file_grid.cpp
@@ -189,11 +189,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 -                        if (!groupParentFolder.empty() &&
 +                        if (itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel || (!groupParentFolder.empty() &&
                              (( stackedGroupRender && row == groupFirstRow + 1) ||
--                             (!stackedGroupRender && row == groupFirstRow))
-+                             (!stackedGroupRender && row == groupFirstRow)))
-                             //&& (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>()) -> show unconditionally, even for missing folders
-                            )
+-                             (!stackedGroupRender && row == groupFirstRow)) &&
++                             (!stackedGroupRender && row == groupFirstRow))) &&
+                             (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())) //don't show for missing folders
                          {
+                             wxRect rectGroupParentText = rectGroupParent;
 @@ -994,16 +1062,16 @@
                              rectGroupItems.x     += 2 * gapSize_;
                              rectGroupItems.width -= 2 * gapSize_;
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index 9492e33..37a1b18 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -155,12 +155,12 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu
          wxBitmapButton(parent, id, wxNullBitmap, pos, size, style, validator, name)
      {
          SetLabel(label);
-diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/dc.h 11.1-2/wx+/dc.h
---- 11.5-0/wx+/dc.h	2021-01-04 08:07:48.384544469 -0500
-+++ 11.5-1/wx+/dc.h	2021-01-04 08:13:41.316314485 -0500
+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 @@
  inline
- int fastFromDIP(double d) //like wxWindow::FromDIP (but tied to primary monitor and buffered)
+ int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered)
  {
 -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS
 -#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined?