diff options
| author | B Stack <bgstack15@gmail.com> | 2019-02-19 14:57:13 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-02-19 14:57:13 +0000 |
| commit | d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14 (patch) | |
| tree | b462c777984dcd461c2d230e703fcf3db1fe03ba /freefilesync/ffs_makefile.patch | |
| parent | FreeFileSync 10.9 rpm and dpkg (diff) | |
| parent | FreeFileSync 10.9-2 for CentOS 7 and Fedora 28-30 (diff) | |
| download | stackrpms-d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14.tar.gz stackrpms-d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14.tar.bz2 stackrpms-d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14.zip | |
Merge branch 'freefilesync-c7' into 'master'
FreeFileSync 10.9-2 for CentOS7 and Fedora 28-30
This is the successful release candidate for FreeFileSync on CentOS7 and Fedora 28-30 from the same spec file.
On CentOS 7, the package build and install dependencies include libcurl 7.64.0, libssh2 1.8.0, openssl 1.1.0 (openssl-freefilesync), which are available in the [bgstack15/FreeFileSync](https://copr.fedorainfracloud.org/coprs/bgstack15/FreeFileSync) copr.
See merge request bgstack15/stackrpms!38
Diffstat (limited to 'freefilesync/ffs_makefile.patch')
| -rw-r--r-- | freefilesync/ffs_makefile.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/freefilesync/ffs_makefile.patch b/freefilesync/ffs_makefile.patch deleted file mode 100644 index 79a8233..0000000 --- a/freefilesync/ffs_makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/Makefile 10.9-1/FreeFileSync/Source/Makefile ---- 10.3-0/FreeFileSync/Source/Makefile 2019-02-10 22:01:42.138160180 -0500 -+++ 10.9-1/FreeFileSync/Source/Makefile 2019-02-11 21:48:19.729739859 -0500 -@@ -1,10 +1,10 @@ --EXENAME = FreeFileSync_$(shell arch) -+EXENAME = FreeFileSync - - CXXFLAGS = -std=c++17 -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -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 - --LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread -+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread - - - CXXFLAGS += `pkg-config --cflags openssl` -diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefile 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-02-10 22:01:42.141160214 -0500 -+++ 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-02-11 21:48:22.504771344 -0500 -@@ -1,10 +1,10 @@ --EXENAME = RealTimeSync_$(shell arch) -+EXENAME = RealTimeSync - - CXXFLAGS = -std=c++17 -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 - --LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread -+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread - - #Gtk - support "no button border" - CXXFLAGS += `pkg-config --cflags gtk+-2.0` |