File FreeFileSync-build.patch of Package FreeFileSync

Overview Repositories Revisions Requests Users Attributes Meta

File FreeFileSync-build.patch of Package FreeFileSync (Revision 3df58736884108b1ac70962be4ca149d)

Currently displaying revision 3df58736884108b1ac70962be4ca149d , Show latest

diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/Makefile FreeFileSync_11.29_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_11.29_Source_orig/FreeFileSync/Source/Makefile	2022-12-16 20:32:28.000000000 +0100
+++ FreeFileSync_11.29_Source/FreeFileSync/Source/Makefile	2022-12-25 16:32:44.158452802 +0100
@@ -3,9 +3,9 @@
 
 CXXFLAGS += -std=c++2b -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 @@
 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)
diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile FreeFileSync_11.29_Source/FreeFileSync/Source/RealTimeSync/Makefile
--- FreeFileSync_11.29_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile	2022-12-16 20:32:28.000000000 +0100
+++ FreeFileSync_11.29_Source/FreeFileSync/Source/RealTimeSync/Makefile	2022-12-25 16:33:54.050236000 +0100
@@ -3,14 +3,15 @@
 
 CXXFLAGS += -std=c++2b -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
diff -Naur FreeFileSync_11.29_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.29_Source/libssh2/libssh2_wrap.h
--- FreeFileSync_11.29_Source_orig/libssh2/libssh2_wrap.h	2022-12-16 20:32:30.000000000 +0100
+++ FreeFileSync_11.29_Source/libssh2/libssh2_wrap.h	2022-12-25 16:37:16.545609654 +0100
@@ -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)
diff -Naur FreeFileSync_11.29_Source_orig/zen/ring_buffer.h FreeFileSync_11.29_Source/zen/ring_buffer.h
--- FreeFileSync_11.29_Source_orig/zen/ring_buffer.h	2022-12-16 20:32:30.000000000 +0100
+++ FreeFileSync_11.29_Source/zen/ring_buffer.h	2022-12-25 16:37:57.073486335 +0100
@@ -8,6 +8,7 @@
 #define RING_BUFFER_H_01238467085684139453534
 
 #include <cassert>
+#include <cstddef>
 #include "scope_guard.h"

Places

File FreeFileSync-build.patch of Package FreeFileSync (Revision 3df58736884108b1ac70962be4ca149d)

Places