diff options
| author | B Stack <bgstack15@gmail.com> | 2020-03-23 15:05:23 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-03-23 15:05:23 +0000 |
| commit | b174e8328fc727df2beb2f4ba364c110ca68e56c (patch) | |
| tree | 2813eb630c4be310b83db09eb0834e2a0b71ab31 /freefilesync/ffs_fedora.patch | |
| parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
| parent | 10.22 rpm rc1 (diff) | |
| download | stackrpms-b174e8328fc727df2beb2f4ba364c110ca68e56c.tar.gz stackrpms-b174e8328fc727df2beb2f4ba364c110ca68e56c.tar.bz2 stackrpms-b174e8328fc727df2beb2f4ba364c110ca68e56c.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync bump
See merge request bgstack15/stackrpms!144
Diffstat (limited to 'freefilesync/ffs_fedora.patch')
| -rw-r--r-- | freefilesync/ffs_fedora.patch | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 546661b..a82ccad 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -1,11 +1,6 @@ -Author: Simon Brulhart -Source: AUR -Date: 2019-10-21 -Message: Do not try to compile inexistant file -Files affected: FreeFileSync/Source/Makefile -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() @@ -16,20 +11,6 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S } -Author: B Stack <bgstack15@gmail.com> -Message: Fedora 29 does not yet use curl 7.66 -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 -@@ -75,7 +75,7 @@ - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); -- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); -+ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND); diff -Naur 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 08:27:42.062542410 -0400 @@ -75,14 +56,14 @@ diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSyn 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 15:51:50.381251257 -0400 +@@ -97,6 +97,8 @@ build += L"64 Bit"; #endif + build += L" for Devuan"; + build += SPACED_BULLET; - build += formatTime<wxString>(FORMAT_DATE, getCompileTime()); + build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime())); |