From e5432efea618b884e41f766813655db52c086522 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 15 Jun 2019 10:03:09 -0400 Subject: freefilesync 10.13 rpm rc1 Fixes #8 .desktop file is missing mimetypes: Added the hooks for dealing with mimetypes, and the icons, and the desktop file mimetype info --- freefilesync/ffs_no_wx311.patch | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'freefilesync/ffs_no_wx311.patch') 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(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(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".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(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(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".config")) + "FreeFileSync"; + std::call_once(onceFlagCreateCfgPath, [&] -- cgit