summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_no_wx311.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-11-17 19:29:15 +0000
committerB Stack <bgstack15@gmail.com>2018-11-17 19:29:15 +0000
commit80aefb756e789203ed65bca896f6933c2e1b4ddd (patch)
tree1636fa457366aa50ea953a938c201e6c4ad8e3d3 /freefilesync/ffs_no_wx311.patch
parentMerge branch 'palemoon-28.2.0' into 'master' (diff)
parentfix getresourcedir casing (diff)
downloadstackrpms-80aefb756e789203ed65bca896f6933c2e1b4ddd.tar.gz
stackrpms-80aefb756e789203ed65bca896f6933c2e1b4ddd.tar.bz2
stackrpms-80aefb756e789203ed65bca896f6933c2e1b4ddd.zip
Merge branch 'freefilesync-bump' into 'master'
freefilesync 10.6 See merge request bgstack15/stackrpms!16
Diffstat (limited to 'freefilesync/ffs_no_wx311.patch')
-rw-r--r--freefilesync/ffs_no_wx311.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch
index 04df827..78ac2a5 100644
--- a/freefilesync/ffs_no_wx311.patch
+++ b/freefilesync/ffs_no_wx311.patch
@@ -25,3 +25,20 @@ 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";
+ }
+
+ #ifdef __GNUC__
bgstack15