diff options
| author | B Stack <bgstack15@gmail.com> | 2020-03-18 16:42:46 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-03-18 16:42:46 -0400 |
| commit | 6f61e4f4d347ee6a3830a784fcc8ed0e2982604d (patch) | |
| tree | eb171d5c806f6a149d061ec0db4eb3632fc7032b /freefilesync/ffs_el.patch | |
| parent | freefilesync 10.22 dpkg rc1 (diff) | |
| download | stackrpms-6f61e4f4d347ee6a3830a784fcc8ed0e2982604d.tar.gz stackrpms-6f61e4f4d347ee6a3830a784fcc8ed0e2982604d.tar.bz2 stackrpms-6f61e4f4d347ee6a3830a784fcc8ed0e2982604d.zip | |
10.22 rpm rc1
Diffstat (limited to 'freefilesync/ffs_el.patch')
| -rw-r--r-- | freefilesync/ffs_el.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index bf4fa20..2df678e 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -2,9 +2,9 @@ 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 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 +diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp +--- 10.13-0/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400 ++++ 10.13-1/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:36:28.178274292 -0400 @@ -55,7 +55,8 @@ Zstring fff::getResourceDirPf() @@ -76,16 +76,16 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim CXXFLAGS += -isystem/usr/include/gtk-2.0 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 07:56:06.714625467 -0500 -+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 08:56:49.251467477 -0500 -@@ -95,6 +95,8 @@ +--- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:49:57.837901137 -0400 ++++ 10.22-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 16:18:46.215713307 -0400 +@@ -97,6 +97,8 @@ build += L"64 Bit"; #endif + build += L" for CentOS 7/Fedora 29"; + build += SPACED_BULLET; - build += formatTime<wxString>(FORMAT_DATE, getCompileTime()); + build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime())); diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/app_main.h --- 10.11-0/wx+/app_main.h 2019-04-12 07:59:44.936143019 -0400 |