FreeFileSync/FreeFileSync-build.patch
Jannik Seiler 81b549558c Accepting request 1045531 from home:seil0:branches:network
- Update to 11.29
  - Fixed crash after 1-byte file copy from MTP device
  - Fixed incorrect installer z-order during auto-update (macOS)
  - Compress copied file only if target folder is marked as NTFS-compressed (Windows)
  - Show install errors without requiring access to "System Events" (macOS)
  - Fall back to creation time if modification time is missing on MTP device
  - Copy/paste filter config via operating system clipboard
  - Show FreeFileSync startup error message when called from RealTimeSync
  - Avoid server round trip when preparing summary email
  - Show path conflict warning aggregated into groups
  - Don't assume path conflict if single write and multiple ignored items
  - Fixed CTRL + Insert clipboard copy for some text controls (Windows, Linux)
- Changes from 11.28
  - Recover from corrupted database file
  - Save database files pair-wise as a transaction
  - Fixed FTP access for Xiaomi "File Manager"
  - Fixed filter full path detection for root directory (Linux/macOS)
  - Fixed recycle bin double initialization bug (Windows)
  - Fixed incorrect case-insensitive string comparison for i and ı
  - Round progress percentage numbers down
- Changes from 11.27
  - Fixed "Some files will be synchronized as part of multiple base folders" false-negative
  - Fixed "Unexpected size of data stream" for Google Drive
  - Fixed crash when downloading empty file from Google Drive
  - RealTimeSync: fixed ffs_batch not accepted as valid configuration
  - Fixed top buttons vertical GUI layout
  - Fixed progress dialog font on Ubuntu MATE
  - Support cut/copy/paste for filter settings
  - Fixed free disk space calculation if target folder not yet created
- Changes from 11.26
  - Faster file copy for SSD-based hard drives (Linux, macOS)
  - Don't fill the OS file cache during file copy (macOS)
  - Removed redundant memory buffering during file copy
  - Fixed ERROR_FILE_EXISTS on Samba share when copying files with NTFS extended attributes
  - Show warning when recycle bin is not available (macOS, Linux)
  - Customize config item background colors
  - Fixed macOS menu bar not showing after app start
  - Fixed normalizing strings with broken UTF encoding
  - Fixed sound playback not working (Linux)
  - Don't allow creating file names ending with dot character (Windows)
- Changes from 11.25
  - Fixed crash when normalizing Unicode non-characters
  - Fixed crash when accesssing Google Drive
  - Fixed regession for decomposed Unicode comparison
  - Fixed "exit code 106: --sign is required" error on macOS
  - Reset icon cache after each comparison
- Changes from 11.24
  - Enhanced filter syntax to match files only (append ':')
  - Fixed "Some files will be synchronized as part of multiple base folders": no more false-positives
  - Detect full path filter items and convert to relative path
  - Auto-detect FTP server character encoding (UTF8 or ANSI)
  - Cancel grid selection via Escape key or second mouse button
  - Apply conflict preview limit accross all folder pairs
  - Require config type and file extension to match
  - Fixed view filter panel vertical layout
  - Strict validation of UTF encoding

OBS-URL: https://build.opensuse.org/request/show/1045531
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=59
2022-12-27 17:26:17 +00:00

89 lines
4.2 KiB
Diff

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"