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_fedora.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_fedora.patch')
| -rw-r--r-- | freefilesync/ffs_fedora.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index debe6a6..dc91530 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -1,16 +1,17 @@ Upstream uses a libcurl more current than Fedora 29. -diff -Naur 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 08:27:24.421735762 -0400 -@@ -59,7 +59,7 @@ - ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName)); +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 @@ - //if (isPortableVersion()) -- return appendSeparator(getExeFolderParentPath()); -+ return appendSeparator("/usr") + appendSeparator("share") + appendSeparator("freefilesync"); - //else //use OS' standard paths - // return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir())); + 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 10.11-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.11-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h --- 10.11-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-04-12 07:59:45.130151956 -0400 +++ 10.11-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-04-12 08:27:24.423735854 -0400 |