diff options
| author | B Stack <bgstack15@gmail.com> | 2019-06-15 15:47:46 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-06-15 15:47:46 +0000 |
| commit | 82800d089b42be1f6d98afd13379db81f5e71ead (patch) | |
| tree | 7e64b76abac725f5aef87b51661449beda73efdc /freefilesync/ffs_no_wx311.patch | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| parent | freefilesync 10.13 dpkg rc1 (diff) | |
| download | stackrpms-82800d089b42be1f6d98afd13379db81f5e71ead.tar.gz stackrpms-82800d089b42be1f6d98afd13379db81f5e71ead.tar.bz2 stackrpms-82800d089b42be1f6d98afd13379db81f5e71ead.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.13
Closes #8
See merge request bgstack15/stackrpms!64
Diffstat (limited to 'freefilesync/ffs_no_wx311.patch')
| -rw-r--r-- | freefilesync/ffs_no_wx311.patch | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index 871e083..a1ff0e4 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -25,20 +25,18 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp toScroll += scrollSpeed * deltaSecs; } else -diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp ---- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 -+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-14 21:39:14.715702415 -0500 -@@ -85,8 +85,11 @@ - else //OS standard path (XDG layout): ~/.config/FreeFileSync - { - //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag -- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); -- cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; -+ -+ // Fedora 28 does not have wxGTK 3.1.1 yet. -+ // So subsitute a hard-coded name instead of requesting file layout of XDG -+ //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); -+ cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync"; - } +diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/Source/base/ffs_paths.cpp +--- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400 ++++ 10.13-1/FreeFileSync/Source/base/ffs_paths.cpp 2019-06-14 20:26:56.794422701 -0400 +@@ -75,8 +75,9 @@ + Zstring cfgFolderPath; + //OS standard path (XDG layout): ~/.config/FreeFileSync + //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag +- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); +- cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; ++ // Fedora does not have wxGTK 3.1.1 which is the dev branch. ++ //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); ++ cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync"; + std::call_once(onceFlagCreateCfgPath, [&] |