From 6dc79e3094a80e29b8de6cb42a843c733fba3628 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 2 Mar 2021 21:46:04 -0500 Subject: ffs 11.7 rc1 --- freefilesync/debian/changelog | 93 ++++++++++++++-------- freefilesync/debian/freefilesync+devuan.dsc | 2 +- .../debian/patches/ffs_no_check_updates.patch | 12 +-- freefilesync/debian/patches/ffs_no_wx311.patch | 14 ---- .../debian/patches/ffs_traditional_view.patch | 6 +- .../revert_zenju_aggressive_upstreamisms.patch | 2 +- freefilesync/ffs_no_check_updates.patch | 12 +-- freefilesync/ffs_no_wx311.patch | 14 ---- freefilesync/ffs_traditional_view.patch | 6 +- freefilesync/freefilesync.spec | 5 +- .../revert_zenju_aggressive_upstreamisms.patch | 2 +- 11 files changed, 85 insertions(+), 83 deletions(-) diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index 78b2845..8ad2afc 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,30 @@ +freefilesync (11.7-1+devuan) obs; urgency=medium + + * Upstream updates + - Detect moved files on FTP (if server supports MLSD) + - Allow installation only for current or all user(s) (Linux) + - Added application uninstaller: uninstall.sh (Linux) + - Use login user config path when running as root (macOS, Linux) + - Fixed detection of moved files with unstable device IDs (macOS, + Linux) + - Strict checking for duplicate file IDs + - Avoid EINVAL invalid argument error when using F_PREALLOCATE + (macOS) + - Restore input focus after closing log panel + - Double-click on file to open Google Drive web interface + - Fixed alpha channel image scaling glitch + - Fixed recycle bin folders being created recursively + - Fixed thread count status message fluctuation + - Don't quit FreeFileSync when parent terminal is closed (SIGHUP) + - Fixed "Operation not supported" error when setting directory locks + - Show folder picker despite SHCreateItemFromParsingName() error + - Work around "OLE received a packet with an invalid header" error + * [bgstack15] By now, none of the old devuan-archive packages are + necessary to build FreeFileSync: Only packages from mainline + unstable release are required! + + -- B. Stack Tue, 02 Mar 2021 17:30:16 -0500 + freefilesync (11.6-1+devuan) obs; urgency=medium * Upstream updates @@ -40,7 +67,7 @@ freefilesync (11.5-1+devuan) obs; urgency=medium - Removed redundant GUI layout recalculations - Keep correct panel sizes after log panel maximize - Support modern folder picker in installer - - Don't raise progress dialog after sync when resuming from systray + - Don't raise progress dialog after sync when resuming from systray -- B. Stack Mon, 04 Jan 2021 08:40:35 -0500 @@ -60,7 +87,7 @@ freefilesync (11.4-1+devuan) obs; urgency=medium - Faster mouse scrolling on high-DPI resolution displays - Keep previous windows size when maximized during auto-exit - -- Ben Stack Tue, 08 Dec 2020 20:32:55 -0500 + -- B. Stack Tue, 08 Dec 2020 20:32:55 -0500 freefilesync (11.3-2+devuan) obs; urgency=medium @@ -68,7 +95,7 @@ freefilesync (11.3-2+devuan) obs; urgency=medium - remove all small gridlines - fix Trad. Rel view with valid relative path names - -- Ben Stack Thu, 05 Nov 2020 13:09:27 -0500 + -- B. Stack Thu, 05 Nov 2020 13:09:27 -0500 freefilesync (11.3-1+devuan) obs; urgency=low @@ -86,7 +113,7 @@ freefilesync (11.3-1+devuan) obs; urgency=low - Updated translation files * [bgstack15] update traditional view patch - -- Ben Stack Mon, 02 Nov 2020 07:44:57 -0500 + -- B. Stack Mon, 02 Nov 2020 07:44:57 -0500 freefilesync (11.2-1+devuan) obs; urgency=low @@ -104,13 +131,13 @@ freefilesync (11.2-1+devuan) obs; urgency=low - Show confirmation dialog before swapping sides * [bgstack15] improve traditional view for current layout - -- Ben Stack Fri, 02 Oct 2020 20:15:18 -0400 + -- B. Stack Fri, 02 Oct 2020 20:15:18 -0400 freefilesync (11.1-2+devuan) obs; urgency=low * add traditional option to main grid view - -- Ben Stack Sun, 06 Sep 2020 20:59:36 -0400 + -- B. Stack Sun, 06 Sep 2020 20:59:36 -0400 freefilesync (11.1-1+devuan) obs; urgency=low @@ -136,7 +163,7 @@ freefilesync (11.1-1+devuan) obs; urgency=low * Pre-allocate target file without setting size * Unified system error message formatting - -- Ben Stack Tue, 01 Sep 2020 20:33:42 -0400 + -- B. Stack Tue, 01 Sep 2020 20:33:42 -0400 freefilesync (11.0-1+devuan) obs; urgency=medium @@ -161,13 +188,13 @@ freefilesync (11.0-1+devuan) obs; urgency=medium * Allow creating folder name with leading/trailing spaces * Start supporting GTK3 (Linux) - -- Ben Stack Wed, 22 Jul 2020 12:55:46 -0400 + -- B. Stack Wed, 22 Jul 2020 12:55:46 -0400 freefilesync (10.25-2+devuan) obs; urgency=medium * gtk2 build (stable) - -- Ben Stack Sat, 20 Jun 2020 16:46:22 -0400 + -- B. Stack Sat, 20 Jun 2020 16:46:22 -0400 freefilesync (10.25-1+devuan) obs; urgency=medium @@ -192,13 +219,13 @@ freefilesync (10.25-1+devuan) obs; urgency=medium * Fixed Google Drive change notificaton evaluation for item without parents * Support double-click/"Browse directory" for (S)FTP/Google Drive (Linux) - -- Ben Stack Fri, 19 Jun 2020 16:21:17 -0400 + -- B. Stack Fri, 19 Jun 2020 16:21:17 -0400 freefilesync (10.24-2+devuan) albion; urgency=medium * gtk2 build (stable) - -- Ben Stack Mon, 18 May 2020 08:14:57 -0400 + -- B. Stack Mon, 18 May 2020 08:14:57 -0400 freefilesync (10.24-1+devuan) obs; urgency=medium @@ -216,13 +243,13 @@ freefilesync (10.24-1+devuan) obs; urgency=medium * Suppport ProFTPD with "MultilineRFC2228 on" * SFTP option to enable/disable zlib compression - -- Ben Stack Sun, 17 May 2020 19:12:44 -0400 + -- B. Stack Sun, 17 May 2020 19:12:44 -0400 freefilesync (10.23-2+devuan) albion; urgency=medium * gtk2 build - -- Ben Stack Mon, 20 Apr 2020 16:11:36 -0400 + -- B. Stack Mon, 20 Apr 2020 16:11:36 -0400 freefilesync (10.23-1+devuan) obs; urgency=medium @@ -249,13 +276,13 @@ freefilesync (10.23-1+devuan) obs; urgency=medium * Avoid blocking command scripts waiting for user input * Updated translation files - -- Ben Stack Mon, 20 Apr 2020 15:09:48 -0400 + -- B. Stack Mon, 20 Apr 2020 15:09:48 -0400 freefilesync (10.22-2+devuan) albion; urgency=medium * gtk2 build - -- Ben Stack Wed, 18 Mar 2020 14:24:32 -0400 + -- B. Stack Wed, 18 Mar 2020 14:24:32 -0400 freefilesync (10.22-1+devuan) UNRELEASED; urgency=medium @@ -275,13 +302,13 @@ freefilesync (10.22-1+devuan) UNRELEASED; urgency=medium * Fixed IWbemServices::ConnectServer error after sync * Fixed aggregate email logs incomplete truncation - -- Ben Stack Wed, 18 Mar 2020 14:22:58 -0400 + -- B. Stack Wed, 18 Mar 2020 14:22:58 -0400 freefilesync (10.21-1+devuan) UNRELEASED; urgency=medium * upstream changelog points to 10.22 - -- Ben Stack Wed, 18 Mar 2020 09:18:01 -0400 + -- B. Stack Wed, 18 Mar 2020 09:18:01 -0400 freefilesync (10.20-1+devuan) obs; urgency=low @@ -302,13 +329,13 @@ freefilesync (10.20-1+devuan) obs; urgency=low * Use Donation Edition on unlimited number of virtual machines * Ignore accidental clicks in empty space of configuration panel - -- B Stack Sat, 15 Feb 2020 15:58:33 -0500 + -- B. Stack Sat, 15 Feb 2020 15:58:33 -0500 freefilesync (10.19-2+devuan) manual; urgency=low * gtk2 build - -- B Stack Fri, 27 Dec 2019 09:52:13 -0500 + -- B. Stack Fri, 27 Dec 2019 09:52:13 -0500 freefilesync (10.19-1+devuan) obs; urgency=low @@ -322,7 +349,7 @@ freefilesync (10.19-1+devuan) obs; urgency=low * Preserve system date format for RTL languages * Fall back to folder path if resource archives are missing - -- B Stack Fri, 27 Dec 2019 09:32:55 -0500 + -- B. Stack Fri, 27 Dec 2019 09:32:55 -0500 freefilesync (10.18-2+devuan) obs; urgency=medium @@ -330,7 +357,7 @@ freefilesync (10.18-2+devuan) obs; urgency=medium * This involves using the local devuan-archive repo because libwxgtk3.0 was dropped in Devuan upstream - -- B Stack Thu, 26 Dec 2019 09:46:15 -0500 + -- B. Stack Thu, 26 Dec 2019 09:46:15 -0500 freefilesync (10.18-1+devuan) obs; urgency=low @@ -349,7 +376,7 @@ freefilesync (10.18-1+devuan) obs; urgency=low * Improved GUI responsiveness during config load * Added Vietnamese translation - -- B Stack Thu, 21 Nov 2019 07:53:41 -0500 + -- B. Stack Thu, 21 Nov 2019 07:53:41 -0500 freefilesync (10.17-1+devuan) obs; urgency=low @@ -364,7 +391,7 @@ freefilesync (10.17-1+devuan) obs; urgency=low * Fixed startup crash caused by corrupted HDD properties * Allow SFTP access via Ed25519 key in PKIX format - -- B Stack Tue, 22 Oct 2019 10:04:13 -0400 + -- B. Stack Tue, 22 Oct 2019 10:04:13 -0400 freefilesync (10.16-1+devuan) obs; urgency=low @@ -387,7 +414,7 @@ freefilesync (10.16-1+devuan) obs; urgency=low * Detect endless folder lock recursion on buggy file systems * Fixed Google Drive parsing error for invalid file time - -- B Stack Tue, 16 Sep 2019 10:04:13 -0400 + -- B. Stack Tue, 16 Sep 2019 10:04:13 -0400 freefilesync (10.15-1+devuan) obs; urgency=low @@ -403,13 +430,13 @@ freefilesync (10.15-1+devuan) obs; urgency=low * Redirect error dialog to stderr during sound playback (Linux) * Updated translation files - -- B Stack Thu, 15 Aug 2019 21:56:04 -0400 + -- B. Stack Thu, 15 Aug 2019 21:56:04 -0400 freefilesync (10.14-2+devuan) manual; urgency=low * Completely disable the update-check - -- B Stack Tue, 16 Jul 2019 12:56:46 -0400 + -- B. Stack Tue, 16 Jul 2019 12:56:46 -0400 freefilesync (10.14-1+devuan) manual; urgency=low @@ -421,7 +448,7 @@ freefilesync (10.14-1+devuan) manual; urgency=low * Access all web endpoints over TLS * Fixed character encoding issue in update reminder (macOS/Linux) - -- B Stack Mon, 15 Jul 2019 15:24:12 -0400 + -- B. Stack Mon, 15 Jul 2019 15:24:12 -0400 freefilesync (10.13-1+devuan) manual; urgency=low @@ -441,7 +468,7 @@ freefilesync (10.13-1+devuan) manual; urgency=low * Fixed pair scrolling mismatch when grid height is exceeded by one row * Fixed startup failure due to missing /etc/machine-id (Linux) - -- B Stack Sat, 15 Jun 2019 10:40:49 -0400 + -- B. Stack Sat, 15 Jun 2019 10:40:49 -0400 freefilesync (10.12-1+devuan) manual; urgency=low @@ -455,7 +482,7 @@ freefilesync (10.12-1+devuan) manual; urgency=low * Dropped support for Windows XP, Server 2003, and Vista * Reduced installation size by 25% - -- B Stack Sun, 13 May 2019 21:51:30 -0500 + -- B. Stack Sun, 13 May 2019 21:51:30 -0500 freefilesync (10.11-1+devuan) manual; urgency=low @@ -467,7 +494,7 @@ freefilesync (10.11-1+devuan) manual; urgency=low * Fixed misleading error when determining file permissions support * Updated wxWidgets, libcurl, libssh2, VS, GCC, Xcode - -- B Stack Fri, 12 Apr 2019 13:30:42 -0500 + -- B. Stack Fri, 12 Apr 2019 13:30:42 -0500 freefilesync (10.10-1devuan) manual; urgency=low @@ -491,7 +518,7 @@ freefilesync (10.10-1devuan) manual; urgency=low * Added context information for cloud connection errors * Updated translation files - -- B Stack Fri, 15 Mar 2019 18:23:43 -0500 + -- B. Stack Fri, 15 Mar 2019 18:23:43 -0500 freefilesync (10.9-1devuan) manual; urgency=low @@ -515,11 +542,11 @@ freefilesync (10.9-1devuan) manual; urgency=low * Avoid redundant Google Drive syncs after file/folder creation * Avoid duplicate MTP item creation by multiple threads - -- B Stack Thu, 14 Feb 2019 10:46:09 -0500 + -- B. Stack Thu, 14 Feb 2019 10:46:09 -0500 freefilesync (10.8-1devuan) manual; urgency=low * Initial release. - -- B Stack Tue, 29 Jan 2019 09:20:41 -0500 + -- B. Stack Tue, 29 Jan 2019 09:20:41 -0500 diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index 30412e2..e2ad9ba 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.6-1+devuan +Version: 11.7-1+devuan Maintainer: B Stack Homepage: https://freefilesync.org/ Standards-Version: 4.1.4 diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index 2413cba..d90bf7d 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -34,10 +34,10 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/main + */ } - -diff -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/Source/ui/version_check.cpp ---- 11.2-0/FreeFileSync/Source/ui/version_check.cpp 2020-10-02 14:39:05.297463367 -0400 -+++ 11.2-1/FreeFileSync/Source/ui/version_check.cpp 2020-10-02 14:55:17.857457477 -0400 + +diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/Source/ui/version_check.cpp +--- 11.7-0/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:21:26.820360086 -0500 ++++ 11.7-1/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:49:29.535590111 -0500 @@ -70,6 +70,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -47,11 +47,11 @@ diff -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/So if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -156,8 +158,7 @@ +@@ -159,8 +161,7 @@ std::wstring updateDetailsMsg; try { -- updateDetailsMsg = utfTo(sendHttpGet(utfTo("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })), +- updateDetailsMsg = utfTo(sendHttpGet(utfTo("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({{"since", ffsVersion}})), - ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError + updateDetailsMsg = utfTo(""); } diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch index b2ee1a9..8e17036 100644 --- a/freefilesync/debian/patches/ffs_no_wx311.patch +++ b/freefilesync/debian/patches/ffs_no_wx311.patch @@ -35,20 +35,6 @@ iff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp toScroll += scrollSpeed * deltaSecs; } else -diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp ---- 10.13-0/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400 -+++ 10.18-1/FreeFileSync/Source/ffs_paths.cpp 2019-11-20 08:55:38.553446634 -0500 -@@ -80,8 +80,8 @@ - - //OS standard path (XDG layout): ~/.config/FreeFileSync - //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag -- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); -- const Zstring cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; -+ // Many distros do not have wxGTK 3.1.1 which is the dev branch. -+ const Zstring cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".config")) + "FreeFileSync"; - - try //create the config folder if not existing + create "Logs" subfolder while we're at it - { diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/ui/command_box.cpp 10.24-1/FreeFileSync/Source/ui/command_box.cpp --- 10.24-0/FreeFileSync/Source/ui/command_box.cpp 2020-05-17 11:01:12.893890567 -0400 +++ 10.24-1/FreeFileSync/Source/ui/command_box.cpp 2020-05-17 11:22:18.069114993 -0400 diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index e7e0952..616d665 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -325,7 +325,7 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_v case ItemPathFormat::full: + case ItemPathFormat::traditional: - if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); - else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); - else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); + if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); + else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); + else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index 37a1b18..30146b7 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -10,7 +10,7 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/ #include @@ -44,11 +43,8 @@ - descrList.push_back({ value, { text, tooltip } }); + descrList.push_back({value, {text, tooltip}}); return *this; } - diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch index 2413cba..d90bf7d 100644 --- a/freefilesync/ffs_no_check_updates.patch +++ b/freefilesync/ffs_no_check_updates.patch @@ -34,10 +34,10 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/main + */ } - -diff -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/Source/ui/version_check.cpp ---- 11.2-0/FreeFileSync/Source/ui/version_check.cpp 2020-10-02 14:39:05.297463367 -0400 -+++ 11.2-1/FreeFileSync/Source/ui/version_check.cpp 2020-10-02 14:55:17.857457477 -0400 + +diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/Source/ui/version_check.cpp +--- 11.7-0/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:21:26.820360086 -0500 ++++ 11.7-1/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:49:29.535590111 -0500 @@ -70,6 +70,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -47,11 +47,11 @@ diff -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/So if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -156,8 +158,7 @@ +@@ -159,8 +161,7 @@ std::wstring updateDetailsMsg; try { -- updateDetailsMsg = utfTo(sendHttpGet(utfTo("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })), +- updateDetailsMsg = utfTo(sendHttpGet(utfTo("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({{"since", ffsVersion}})), - ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError + updateDetailsMsg = utfTo(""); } diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index b2ee1a9..8e17036 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -35,20 +35,6 @@ iff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp toScroll += scrollSpeed * deltaSecs; } else -diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp ---- 10.13-0/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400 -+++ 10.18-1/FreeFileSync/Source/ffs_paths.cpp 2019-11-20 08:55:38.553446634 -0500 -@@ -80,8 +80,8 @@ - - //OS standard path (XDG layout): ~/.config/FreeFileSync - //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag -- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); -- const Zstring cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; -+ // Many distros do not have wxGTK 3.1.1 which is the dev branch. -+ const Zstring cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".config")) + "FreeFileSync"; - - try //create the config folder if not existing + create "Logs" subfolder while we're at it - { diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/ui/command_box.cpp 10.24-1/FreeFileSync/Source/ui/command_box.cpp --- 10.24-0/FreeFileSync/Source/ui/command_box.cpp 2020-05-17 11:01:12.893890567 -0400 +++ 10.24-1/FreeFileSync/Source/ui/command_box.cpp 2020-05-17 11:22:18.069114993 -0400 diff --git a/freefilesync/ffs_traditional_view.patch b/freefilesync/ffs_traditional_view.patch index e7e0952..616d665 100644 --- a/freefilesync/ffs_traditional_view.patch +++ b/freefilesync/ffs_traditional_view.patch @@ -325,7 +325,7 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_v case ItemPathFormat::full: + case ItemPathFormat::traditional: - if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); - else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); - else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); + if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); + else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); + else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath(folderPairs_)); diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 93d252d..3266986 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 11.6 +Version: 11.7 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 Mar 02 2021 B. Stack - 11.7-1 +- version bump + * Tue Feb 02 2021 B. Stack - 11.6-1 - version bump - upstream removed png files from outside zip; so just use them from the Icons.zip. diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index 37a1b18..30146b7 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch @@ -10,7 +10,7 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/ #include @@ -44,11 +43,8 @@ - descrList.push_back({ value, { text, tooltip } }); + descrList.push_back({value, {text, tooltip}}); return *this; } - -- cgit