summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_makefile.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-02-14 18:20:14 +0000
committerB Stack <bgstack15@gmail.com>2019-02-14 18:20:14 +0000
commit899f8baa296bb3ebcb2a79d52113c1ddd643a08a (patch)
tree324a06c40b35c1ee785077e0a3c67b31d3a75e9e /freefilesync/ffs_makefile.patch
parentpm-ublock dpkg for devuan (diff)
parentFreeFileSync 10.9 rpm and dpkg (diff)
downloadstackrpms-899f8baa296bb3ebcb2a79d52113c1ddd643a08a.tar.gz
stackrpms-899f8baa296bb3ebcb2a79d52113c1ddd643a08a.tar.bz2
stackrpms-899f8baa296bb3ebcb2a79d52113c1ddd643a08a.zip
FreeFileSync 10.9 rpm and dpkg
Application changes * Added FTP, SFTP, Google Drive support for Linux * FreeFileSync Donation Edition available for Linux * Compress file stream during Google Drive upload * Navigate beyond access-denied parents in SFTP folder picker * Fixed unexpected stream size error during FTP upload * Support native recursive deletion for Google Drive * Support native recursive deletion for MTP * Deterministically save Google Drive state during exit * Work around missing TMPDIR variable (Linux) * Support SFTP servers returning large package sizes during folder reading * Start with home path when using SFTP folder picker * Aggregate device authentication prompts during comparison * Clean up temp file after unexpected stream size error * Work around FTP servers not supporting HELP command * Support parsing path by volume name when volume is missing * Parse and streamline Google Drive error messages * Load next item after deleting from config history * Avoid redundant Google Drive syncs after file/folder creation * Avoid duplicate MTP item creation by multiple threads Package changes * Upstream removed Makefile install target, so each package implements basically identical, local install targets * Added patches for older versions of dependencies which do not alter basic usage of the application See merge request bgstack15/stackrpms!37
Diffstat (limited to 'freefilesync/ffs_makefile.patch')
-rw-r--r--freefilesync/ffs_makefile.patch40
1 files changed, 20 insertions, 20 deletions
diff --git a/freefilesync/ffs_makefile.patch b/freefilesync/ffs_makefile.patch
index b3ff7ff..79a8233 100644
--- a/freefilesync/ffs_makefile.patch
+++ b/freefilesync/ffs_makefile.patch
@@ -1,32 +1,32 @@
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/Makefile 10.3-2/FreeFileSync/Source/Makefile
---- 10.3-0/FreeFileSync/Source/Makefile 2018-08-07 05:03:33.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/Makefile 2018-08-15 22:25:06.694355202 -0400
-@@ -9,7 +9,7 @@
+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
-
- #Gtk - support recycler/icon loading/no button border/grid scrolling
- CXXFLAGS += `pkg-config --cflags gtk+-2.0`
-@@ -101,6 +101,7 @@
- all: ../Build/Bin/$(APPNAME)
- ../Build/Bin/$(APPNAME): $(OBJ_FILES)
-+ mkdir -p ../Build/Bin
- g++ -o $@ $^ $(LINKFLAGS)
- ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-07 05:03:33.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-15 22:25:15.968461418 -0400
-@@ -6,7 +6,7 @@
+ 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