pool/FreeFileSync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
efd66c6d47
FreeFileSync/FreeFileSync-build.patch
Jannik Seiler 1a3ed4ed50 Accepting request 982156 from home:seil0:branches:network 
- Update to 11.19
  - Improved performance for huge exclusion filter lists: linear to constant(!) time
  - Support sync with Google Drive starred folders
  -   - Access "My Computers" (as created by Google Backup and Sync) if starred
  - Western Digital Mycloud NAS: fixed ERROR_ALREADY_EXISTS when changing case
  - Added per-file progress for "copy to" function
  - Have filter wildcard ? not match path separator
  - Work around WBEM_E_INVALID_NAMESPACE error during installation
  - Fixed login user incorrectly displayed as root (macOS)
  - Save Google Drive buffer before system shutdown
- Changes from 11.18
  - Add comparison time to sync log when using GUI
  - Added user-configurable timeout for Google Drive
  - Consider port when comparing (S)FTP paths for equality
  - Fixed SFTP key file login error on OpenSSH_8.8p1
  - Add error details for NSFileReadUnknownError (macOS)
  - Disable new config button when already at default
  - Use user language instead of region locale during installation
- Changes from 11.17
  - Show per-file progress in percent when copying large files
  - Log app initialization errors
  - Fixed uncaught exception after installation
  - Defer testing for third-party buggy DLLs until after crashing
  - Consider ReFS 128-bit file ID failure states (Windows)
  - Refer to volume by name: support names including brackets
  - Support local installation with non-standard home (Linux)
- Add FreeFileSync-build-with-gcc12.patch to fix build with gcc12
- Add FreeFileSync-build-with-wx3.1.5.patch to fix build with wxWidgets 3.1.5
- Update FreeFileSync-build.patch for version 11.19

OBS-URL: https://build.opensuse.org/request/show/982156
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=54
2022-06-11 17:26:29 +00:00

89 lines
4.2 KiB
Diff
Raw Blame History

diff -Naur FreeFileSync_11.21_Source_orig/FreeFileSync/Source/Makefile FreeFileSync_11.21_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_11.21_Source_orig/FreeFileSync/Source/Makefile 2022-05-17 10:02:16.000000000 +0200
+++ FreeFileSync_11.21_Source/FreeFileSync/Source/Makefile 2022-06-10 17:50:49.936634424 +0200
@@ -2,9 +2,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
-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
+linkFlags = -s `wx-config --libs std, aui, richtext --debug=no` -pthread -lz -pie
cxxFlags += `pkg-config --cflags openssl`
@@ -16,9 +16,10 @@
cxxFlags += `pkg-config --cflags libssh2`
linkFlags += `pkg-config --libs libssh2`
-cxxFlags += `pkg-config --cflags gtk+-2.0`
+cxxFlags += `pkg-config --cflags gtk+-3.0`
+linkFlags += `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.21_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile FreeFileSync_11.21_Source/FreeFileSync/Source/RealTimeSync/Makefile
--- FreeFileSync_11.21_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile 2022-05-17 10:02:16.000000000 +0200
+++ FreeFileSync_11.21_Source/FreeFileSync/Source/RealTimeSync/Makefile 2022-06-10 17:51:33.900512197 +0200
@@ -2,14 +2,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
-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
+linkFlags = -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`
+linkFlags += `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.21_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.21_Source/libssh2/libssh2_wrap.h
--- FreeFileSync_11.21_Source_orig/libssh2/libssh2_wrap.h 2022-05-17 10:02:16.000000000 +0200
+++ FreeFileSync_11.21_Source/libssh2/libssh2_wrap.h 2022-06-10 17:53:11.880246224 +0200
@@ -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.21_Source_orig/zen/ring_buffer.h FreeFileSync_11.21_Source/zen/ring_buffer.h
--- FreeFileSync_11.21_Source_orig/zen/ring_buffer.h 2022-05-17 10:02:18.000000000 +0200
+++ FreeFileSync_11.21_Source/zen/ring_buffer.h 2022-06-10 17:54:25.040065784 +0200
@@ -8,6 +8,7 @@
#define RING_BUFFER_H_01238467085684139453534
#include <cassert>
+#include <cstddef>
#include "scope_guard.h"
Reference in New Issue View Git Blame Copy Permalink