diff options
| author | B Stack <bgstack15@gmail.com> | 2019-10-22 09:37:03 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-10-22 09:37:03 -0400 |
| commit | 8303df38956fc971a236a2c7fc776a8da2f6ab54 (patch) | |
| tree | 14dcd7db72e60d718aaf01efd3464acc7c07fa11 /freefilesync/ffs_fedora.patch | |
| parent | freefilesync 10.17 dpkg rc1 (diff) | |
| download | stackrpms-8303df38956fc971a236a2c7fc776a8da2f6ab54.tar.gz stackrpms-8303df38956fc971a236a2c7fc776a8da2f6ab54.tar.bz2 stackrpms-8303df38956fc971a236a2c7fc776a8da2f6ab54.zip | |
WIP: freefilesync 10.17 rpm rc1
Attempt at updating the patches for 10.17. Need to try with libcurl
7.66.0 which my local install does not have.
Diffstat (limited to 'freefilesync/ffs_fedora.patch')
| -rw-r--r-- | freefilesync/ffs_fedora.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 3355299..5c5e3b7 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -1,4 +1,8 @@ -Upstream uses a libcurl more current than Fedora 29. +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 @@ -7,11 +11,13 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S Zstring fff::getResourceDirPf() { - return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR; -+ // For Fedora/EL, install to /usr/share/freefilesync specificly ++ // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly + return Zstr("/usr/share/freefilesync/"); } +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 @@ -31,7 +37,7 @@ diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Make -EXENAME = FreeFileSync_$(shell arch) +EXENAME = FreeFileSync - CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread @@ -48,6 +54,14 @@ diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Make #treat as system headers so that warnings are hidden: CXXFLAGS += -isystem/usr/include/gtk-2.0 +@@ -56,7 +56,6 @@ + CPP_FILES+=afs/init_curl_libssh2.cpp + CPP_FILES+=afs/native.cpp + CPP_FILES+=afs/sftp.cpp +-CPP_FILES+=afs/libssh2/init_libssh2.cpp + CPP_FILES+=ui/batch_config.cpp + CPP_FILES+=ui/abstract_folder_picker.cpp + CPP_FILES+=ui/batch_status_handler.cpp diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile --- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 07:59:45.008146336 -0400 +++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-08-15 13:59:53.934551753 -0400 |