summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_el.patch
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync/ffs_el.patch')
-rw-r--r--freefilesync/ffs_el.patch14
1 files changed, 11 insertions, 3 deletions
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index 1e75f1c..05d8dd6 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -10,7 +10,7 @@ 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/");
}
@@ -22,8 +22,8 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefil
-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++17 -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" \
++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
+ -O3 -DNDEBUG -fPIC `wx-config --version=3.0 --cxxflags --debug=no` -pthread
@@ -75,6 +75,14 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
#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 -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp
--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 07:59:45.318160616 -0400
+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 10:19:57.228913439 -0400
bgstack15