From 50470fbc44d3f1dd8b0420ce95b1d4b54cb10af9 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 24 May 2022 09:51:03 -0400 Subject: ffs: on devuan use g++-12 and fix new wx3.1.1 stuff --- freefilesync/debian/patches/ffs_traditional_view.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'freefilesync/debian/patches/ffs_traditional_view.patch') diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index aeeb9b2..e0cf0d2 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -1,5 +1,5 @@ Version: 11.21 -Date: 2022-05-22 +Date: 2022-05-24 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 @@ -85,7 +85,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11. + if (!endsWith(groupParentFolder, L'/' ) && //e.g. ftp://server/ + !endsWith(groupParentFolder, L'\\') && /*e.g. C:\ */ + groupParentFolder.size() > 0 ) -+ groupParentFolder += groupParentSep; ++ groupParentFolder += contains(groupParentFolder, L'/') ? L'/' : (contains(groupParentFolder, L'\\') ? L'\\' : FILE_NAME_SEPARATOR); + break; + case ItemPathFormat::name: + case ItemPathFormat::relative: -- cgit