summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_makefile.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-04-15 19:25:07 +0000
committerB Stack <bgstack15@gmail.com>2019-04-15 19:25:07 +0000
commit27985e791445015daf2c4ca5b98cec3b803aae35 (patch)
tree41ce613341b45e1245d1087b74a1741dbebffd73 /freefilesync/debian/patches/ffs_makefile.patch
parent7w add build-depends ImageMagick (diff)
parentfreefilesync build 10.11 dpkg (diff)
downloadstackrpms-27985e791445015daf2c4ca5b98cec3b803aae35.tar.gz
stackrpms-27985e791445015daf2c4ca5b98cec3b803aae35.tar.bz2
stackrpms-27985e791445015daf2c4ca5b98cec3b803aae35.zip
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.11 See merge request bgstack15/stackrpms!52
Diffstat (limited to 'freefilesync/debian/patches/ffs_makefile.patch')
-rw-r--r--freefilesync/debian/patches/ffs_makefile.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/freefilesync/debian/patches/ffs_makefile.patch b/freefilesync/debian/patches/ffs_makefile.patch
deleted file mode 100644
index 79a8233..0000000
--- a/freefilesync/debian/patches/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`
bgstack15