summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_el.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-06-15 15:47:46 +0000
committerB Stack <bgstack15@gmail.com>2019-06-15 15:47:46 +0000
commit82800d089b42be1f6d98afd13379db81f5e71ead (patch)
tree7e64b76abac725f5aef87b51661449beda73efdc /freefilesync/ffs_el.patch
parentMerge branch 'scite-bump' into 'master' (diff)
parentfreefilesync 10.13 dpkg rc1 (diff)
downloadstackrpms-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_el.patch')
-rw-r--r--freefilesync/ffs_el.patch23
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
bgstack15