FreeFileSync/FreeFileSync-Build.patch
Jannik Seiler ea9ae66eda Accepting request 839423 from home:seil0:branches:network
- Update to 11.2
  - Improved grid layout with file icons hidden
  - Improved rendering of inactive and disabled grid items
  - Remember last user-selected paths for file and folder pickers
  - Fixed folder name hidden in "item name" view type
  - Fixed determination of unsupported trash folder (Linux)
  - Fixed copying broken symlinks (macOS)
  - Fixed default action when pressing Enter in popup dialogs
  - Fixed default popup dialog size (macOS)
  - Use localized start of week for %WeekDay% (Linux, macOS)
  - Swap sides using CTRL+W instead of F10
  - Show confirmation dialog before swapping sides
- Update to 11.1
  - New file group layout on main grid (reloaded)
  - Alternate colors for main grid folder groups
  - Added file group context menu
  - Quick selection of items in folder group
  - Fixed FTP access errors with Explicit SSL/TLS
  - Fixed Google Drive error when double quotes in file name
  - Fixed RTL layout bug with number input control
  - Fixed grid column default sizes
  - Fixed grid rendering performance during mouse scrolling
  - Update all config files transactionally
  - Respect user-preferred number/time format (Linux)
  - Fixed floating panels not being resizable (Linux)
  - Instantly open selection context menu on right mouse button down
  - Further improved high DPI support
  - Updated deprecated system API calls (requires macOS 10.10 or later)
  - Fixed crash when accessing Nexis storage (macOS)
  - Avoid buffer flush when aborting native file output
  - Clear preview after folder history selection
  - Pre-allocate target file without setting size
  - Unified system error message formatting

OBS-URL: https://build.opensuse.org/request/show/839423
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=37
2020-10-04 13:56:49 +00:00

89 lines
4.1 KiB
Diff

diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/Makefile FreeFileSync_11.2_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_11.2_Source_orig/FreeFileSync/Source/Makefile 2020-10-02 20:14:56.000000000 +0200
+++ FreeFileSync_11.2_Source/FreeFileSync/Source/Makefile 2020-10-03 10:53:29.564126702 +0200
@@ -2,9 +2,9 @@
cxxFlags = -std=c++2a -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 --debug=no` -pthread
+linkFlags = -s `wx-config --libs std, aui --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 -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile FreeFileSync_11.2_Source/FreeFileSync/Source/RealTimeSync/Makefile
--- FreeFileSync_11.2_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 20:14:56.000000000 +0200
+++ FreeFileSync_11.2_Source/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-03 10:54:14.051922165 +0200
@@ -2,14 +2,15 @@
cxxFlags = -std=c++2a -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 --debug=no` -pthread
+linkFlags = -s `wx-config --libs std, aui --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 -ruN FreeFileSync_11.2_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.2_Source/libssh2/libssh2_wrap.h
--- FreeFileSync_11.2_Source_orig/libssh2/libssh2_wrap.h 2020-10-02 20:14:58.000000000 +0200
+++ FreeFileSync_11.2_Source/libssh2/libssh2_wrap.h 2020-10-03 10:55:03.571680367 +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 -ruN FreeFileSync_11.2_Source_orig/zen/ring_buffer.h FreeFileSync_11.2_Source/zen/ring_buffer.h
--- FreeFileSync_11.2_Source_orig/zen/ring_buffer.h 2020-10-02 20:14:58.000000000 +0200
+++ FreeFileSync_11.2_Source/zen/ring_buffer.h 2020-10-03 10:55:35.991520674 +0200
@@ -8,6 +8,7 @@
#define RING_BUFFER_H_01238467085684139453534
#include <cassert>
+#include <cstddef>
#include "scope_guard.h"