diff options
| author | B Stack <bgstack15@gmail.com> | 2021-03-03 13:48:13 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-03-03 13:48:13 +0000 |
| commit | c2b81c1ef445010392304ce11a3a4f29e8c44976 (patch) | |
| tree | 1e39ccf0a22cb26aaa3e587bf656a2b037a3ae79 /freefilesync/debian/patches/ffs_no_wx311.patch | |
| parent | Merge branch 'notepadpp-bump' into 'master' (diff) | |
| parent | ffs 11.7 rc1 (diff) | |
| download | stackrpms-c2b81c1ef445010392304ce11a3a4f29e8c44976.tar.gz stackrpms-c2b81c1ef445010392304ce11a3a4f29e8c44976.tar.bz2 stackrpms-c2b81c1ef445010392304ce11a3a4f29e8c44976.zip | |
Merge branch 'freefilesync-bump' into 'master'
ffs 11.7
See merge request bgstack15/stackrpms!224
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_wx311.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_wx311.patch | 14 |
1 files changed, 0 insertions, 14 deletions
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<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; -+ // Many distros do not have wxGTK 3.1.1 which is the dev branch. -+ const Zstring cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".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 |