From fcb2226b976880e80f8bc4fdbd09d06d2a9e8d72 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 2 Feb 2021 13:33:22 -0500 Subject: ffs 11.6 rc1 --- freefilesync/debian/changelog | 23 ++++++++++++++++++++++ freefilesync/debian/freefilesync+devuan.dsc | 2 +- freefilesync/debian/patches/ffs_sftp.patch | 14 +++++++------ .../debian/patches/ffs_traditional_view.patch | 12 +++++------ .../revert_zenju_aggressive_upstreamisms.patch | 8 ++++---- freefilesync/ffs_sftp.patch | 14 +++++++------ freefilesync/ffs_traditional_view.patch | 12 +++++------ freefilesync/freefilesync.spec | 5 ++++- .../revert_zenju_aggressive_upstreamisms.patch | 8 ++++---- 9 files changed, 64 insertions(+), 34 deletions(-) (limited to 'freefilesync') diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index 75dd001..8083b90 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,26 @@ +freefilesync (11.6-1+devuan) obs; urgency=medium + + * Upstream updates + - New FreeFileSync installer (Linux) + - New auto-updater for the Donation Edition (macOS, Linux) + - Support reading FTP file symlinks + - Added context menu option "Edit with FreeFileSync" (Linux, KDE) + - Support starting via symlink (macOS) + - Command line support with "freefilesync" symlink in /usr/local/bin (macOS) + - Fixed starting via symlink found by PATH (Linux) + - Preserve keyboard focus when starting sync via F9 + - Don't show relative parent path if folder does not exist + - Added high-resolution application icons (Linux, macOS) + - Work around "500 'HELP' command unrecognized" FTP error + - Fixed menu bar icon not being removed immediately (macOS Big Sur) + - Don't allow folder names ending with dot character (Windows) + - Mitigate ERROR_ALREADY_ASSIGNED: Local Device Name Already in Use [Wnetaddconnection2] + - Fixed startup failure when app folder contains back quote char (macOS) + - Fixed network card not found error on virtual machine (KVM Linux) + - Fixed RTL layout direction in popup dialogs + + -- B. Stack Tue, 02 Feb 2021 13:30:10 -0500 + freefilesync (11.5-1+devuan) obs; urgency=medium * Upstream updates diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index 46daffe..30412e2 100644 --- a/freefilesync/debian/freefilesync+devuan.dsc +++ b/freefilesync/debian/freefilesync+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: freefilesync Binary: freefilesync Architecture: any -Version: 11.5-1+devuan +Version: 11.6-1+devuan Maintainer: B Stack Homepage: https://freefilesync.org/ Standards-Version: 4.1.4 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: 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()) -> show unconditionally, even for missing folders - ) +- (!stackedGroupRender && row == groupFirstRow)) && ++ (!stackedGroupRender && row == groupFirstRow))) && + (groupName.empty() || !pdi.folderGroupObj->isEmpty())) //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? diff --git a/freefilesync/ffs_sftp.patch b/freefilesync/ffs_sftp.patch index 09e6655..a51acc8 100644 --- a/freefilesync/ffs_sftp.patch +++ b/freefilesync/ffs_sftp.patch @@ -1,13 +1,14 @@ Source: 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/ffs_traditional_view.patch b/freefilesync/ffs_traditional_view.patch index e5c4a14..e7e0952 100644 --- a/freefilesync/ffs_traditional_view.patch +++ b/freefilesync/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()) -> show unconditionally, even for missing folders - ) +- (!stackedGroupRender && row == groupFirstRow)) && ++ (!stackedGroupRender && row == groupFirstRow))) && + (groupName.empty() || !pdi.folderGroupObj->isEmpty())) //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/freefilesync.spec b/freefilesync/freefilesync.spec index 9f36b2c..f4a0c2b 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 11.5 +Version: 11.6 Release: 1%{?dist} Summary: A file synchronization utility @@ -207,6 +207,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Tue Feb 02 2021 B. Stack - 11.6-1 +- version bump + * Mon Jan 04 2021 B. Stack - 11.5-1 - version bump diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index 9492e33..37a1b18 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/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? -- cgit