bf8ba3aac6
* Merge logs of individual steps (comparison, manual operation, sync) * Show total percentage in progress dialog header * Log and report errors during cleanup or exception handling * Skip folder traversal if existence check fails for other side of the pair * Automatically adapt batch options to prevent hanging a non-interactive process (Windows) * Support path lists for external applications: %item_paths%, %local_paths%, %item_names%, %parent_paths% * Create directory lock files with hidden attribute * Don't clear other side when right-clicking file selection * Fixed passive FTP when using different IP than control connection * Work around FTP servers silently renaming unsupported characters of temporary file OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=69
93 lines
3.9 KiB
Diff
93 lines
3.9 KiB
Diff
Index: FreeFileSync-12.5/FreeFileSync/Source/Makefile
|
|
===================================================================
|
|
--- FreeFileSync-12.5.orig/FreeFileSync/Source/Makefile
|
|
+++ FreeFileSync-12.5/FreeFileSync/Source/Makefile
|
|
@@ -3,9 +3,9 @@ exeName = FreeFileSync_$(shell arch)
|
|
|
|
CXXFLAGS += -std=c++23 -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
|
|
- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
|
|
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie
|
|
|
|
-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
|
|
+LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread -lz -pie
|
|
|
|
|
|
CXXFLAGS += `pkg-config --cflags openssl`
|
|
@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl`
|
|
CXXFLAGS += `pkg-config --cflags libssh2`
|
|
LDFLAGS += `pkg-config --libs libssh2`
|
|
|
|
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
|
|
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
|
|
+LDFLAGS += `pkg-config --libs gtk+-3.0`
|
|
#treat as system headers so that warnings are hidden:
|
|
-CXXFLAGS += -isystem/usr/include/gtk-2.0
|
|
+CXXFLAGS += -isystem/usr/include/gtk-3.0
|
|
|
|
#support for SELinux (optional)
|
|
SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
|
|
Index: FreeFileSync-12.5/FreeFileSync/Source/RealTimeSync/Makefile
|
|
===================================================================
|
|
--- FreeFileSync-12.5.orig/FreeFileSync/Source/RealTimeSync/Makefile
|
|
+++ FreeFileSync-12.5/FreeFileSync/Source/RealTimeSync/Makefile
|
|
@@ -3,14 +3,15 @@ exeName = RealTimeSync_$(shell arch)
|
|
|
|
CXXFLAGS += -std=c++23 -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
|
|
- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
|
|
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie
|
|
|
|
-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
|
|
+LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread -lz -pie
|
|
|
|
#Gtk - support "no button border"
|
|
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
|
|
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
|
|
+LDFLAGS += `pkg-config --libs gtk+-3.0`
|
|
#treat as system headers so that warnings are hidden:
|
|
-CXXFLAGS += -isystem/usr/include/gtk-2.0
|
|
+CXXFLAGS += -isystem/usr/include/gtk-3.0
|
|
|
|
cppFiles=
|
|
cppFiles+=application.cpp
|
|
Index: FreeFileSync-12.5/libssh2/libssh2_wrap.h
|
|
===================================================================
|
|
--- FreeFileSync-12.5.orig/libssh2/libssh2_wrap.h
|
|
+++ FreeFileSync-12.5/libssh2/libssh2_wrap.h
|
|
@@ -20,6 +20,22 @@
|
|
#error libssh2_sftp.h header guard changed
|
|
#endif
|
|
|
|
+// fix some build errors
|
|
+/* MAX_SFTP_READ_SIZE is how much data is asked for at max in each FXP_READ
|
|
+ * packets.
|
|
+ */
|
|
+#ifndef MAX_SFTP_READ_SIZE
|
|
+ #define MAX_SFTP_READ_SIZE 30000
|
|
+#endif
|
|
+
|
|
+/*
|
|
+ * MAX_SFTP_OUTGOING_SIZE MUST not be larger than 32500 or so. This is the
|
|
+ * amount of data sent in each FXP_WRITE packet
|
|
+ */
|
|
+#ifndef MAX_SFTP_OUTGOING_SIZE
|
|
+ #define MAX_SFTP_OUTGOING_SIZE 30000
|
|
+#endif
|
|
+
|
|
//fix libssh2 64-bit warning mess: https://github.com/libssh2/libssh2/pull/96
|
|
#undef libssh2_userauth_password
|
|
inline int libssh2_userauth_password(LIBSSH2_SESSION* session, const std::string& username, const std::string& password)
|
|
Index: FreeFileSync-12.5/zen/ring_buffer.h
|
|
===================================================================
|
|
--- FreeFileSync-12.5.orig/zen/ring_buffer.h
|
|
+++ FreeFileSync-12.5/zen/ring_buffer.h
|
|
@@ -8,6 +8,7 @@
|
|
#define RING_BUFFER_H_01238467085684139453534
|
|
|
|
#include <cassert>
|
|
+#include <cstddef>
|
|
#include "scope_guard.h"
|
|
|
|
|