diff options
| author | B Stack <bgstack15@gmail.com> | 2019-06-15 10:03:09 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-06-15 10:03:09 -0400 |
| commit | e5432efea618b884e41f766813655db52c086522 (patch) | |
| tree | 3964f2a2ff7bcefbfc1adee93256eafea4a9ae7e /freefilesync/ffs_el.patch | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| download | stackrpms-e5432efea618b884e41f766813655db52c086522.tar.gz stackrpms-e5432efea618b884e41f766813655db52c086522.tar.bz2 stackrpms-e5432efea618b884e41f766813655db52c086522.zip | |
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
Diffstat (limited to 'freefilesync/ffs_el.patch')
| -rw-r--r-- | freefilesync/ffs_el.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index a64c21f..644dfcb 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -2,18 +2,19 @@ The cstddef discovery is from https://stackoverflow.com/questions/52567517/freef Some changes just make the application work better in an installed setting (e.g., the hard-coded resouce path). Tricking the wxWidgets ABI version comes from https://stackoverflow.com/questions/45123664/wxwidgets-runtime-error-mismatch-version/47822976#47822976 FreeFileSync 10.11 updated the default compile flags to -std=c++2a, but this fails on gcc 4.8.5 on el7. Reverting to -std=c++17 allows the application to compile. -diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp ---- 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp 2019-04-12 07:59:45.368162920 -0400 -+++ 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp 2019-04-12 10:19:57.226913391 -0400 -@@ -59,7 +59,7 @@ - ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName)); - - //if (isPortableVersion()) -- return appendSeparator(getExeFolderParentPath()); -+ return appendSeparator("/usr") + appendSeparator("share") + appendSeparator("freefilesync"); - //else //use OS' standard paths - // return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir())); +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:36:28.178274292 -0400 +@@ -55,7 +55,8 @@ + + Zstring fff::getResourceDirPf() + { +- return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR; ++ // For Fedora/EL, install to /usr/share/freefilesync specificly ++ return Zstr("/usr/share/freefilesync/"); } + + diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile --- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 07:59:45.042147902 -0400 +++ 10.11-1/FreeFileSync/Source/Makefile 2019-04-12 10:21:04.341525635 -0400 |