pool/FreeFileSync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 855494 from home:seil0:branches:network

Browse Source 
- Update to 11.4
  - New progress graph "this one sparks joy"
  - Remember progress dialog size
  - New config file context menu option: Show in file manager
  - Work around libcurl performance bug during FTP upload
  - Only log modification time errors after comparing by size or content
  - Smaller icon size for efficient screen layout (Linux)
  - Use system-native recycle bin icon
  - Fixed DeviceIoControl(IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS): ERROR_MORE_DATA
  - Support MTP devices lacking a friendly name
  - Fix grid scrolling with small mouse rotations (macOS)
  - Faster mouse scrolling on high-DPI resolution displays
  - Keep previous windows size when maximized during auto-exit
- use %autosetup instead of %setup and %patch
- replace %desktop_database_postun with %filetrigger{in,postun}

OBS-URL: https://build.opensuse.org/request/show/855494
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=41
This commit is contained in:
Jannik Seiler 2020-12-12 21:30:56 +00:00 committed by Git OBS Bridge
parent 53710f8ae8
commit 6af3f05ce4
5 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
FreeFileSync-Build.patch
View File

@ -1,6 +1,6 @@
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
diff -Naur FreeFileSync_11.4_Source_orig/FreeFileSync/Source/Makefile FreeFileSync_11.4_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_11.4_Source_orig/FreeFileSync/Source/Makefile 2020-12-05 14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/FreeFileSync/Source/Makefile 2020-12-11 09:24:39.418116342 +0100
@@ -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" \
@ -8,8 +8,8 @@ diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/Makefile FreeFileSyn
- -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
-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`
@ -26,9 +26,9 @@ diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/Makefile FreeFileSyn
#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
diff -Naur FreeFileSync_11.4_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile FreeFileSync_11.4_Source/FreeFileSync/Source/RealTimeSync/Makefile
--- FreeFileSync_11.4_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-05 14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-11 09:19:38.287288344 +0100
@@ -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" \
@ -36,8 +36,8 @@ diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/RealTimeSync/Makefil
- -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
-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`
@ -49,9 +49,9 @@ diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/RealTimeSync/Makefil
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
diff -Naur FreeFileSync_11.4_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.4_Source/libssh2/libssh2_wrap.h
--- FreeFileSync_11.4_Source_orig/libssh2/libssh2_wrap.h 2020-12-05 14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/libssh2/libssh2_wrap.h 2020-12-11 09:17:38.447774909 +0100
@@ -20,6 +20,22 @@
#error libssh2_sftp.h header guard changed
#endif
@ -61,7 +61,7 @@ diff -ruN FreeFileSync_11.2_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.2
+ * packets.
+ */
+#ifndef MAX_SFTP_READ_SIZE
+#define MAX_SFTP_READ_SIZE 30000
+ #define MAX_SFTP_READ_SIZE 30000
+#endif
+
+/*
@ -69,15 +69,15 @@ diff -ruN FreeFileSync_11.2_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.2
+ * amount of data sent in each FXP_WRITE packet
+ */
+#ifndef MAX_SFTP_OUTGOING_SIZE
+#define MAX_SFTP_OUTGOING_SIZE 30000
+ #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
diff -Naur FreeFileSync_11.4_Source_orig/zen/ring_buffer.h FreeFileSync_11.4_Source/zen/ring_buffer.h
--- FreeFileSync_11.4_Source_orig/zen/ring_buffer.h 2020-12-05 14:38:38.000000000 +0100
+++ FreeFileSync_11.4_Source/zen/ring_buffer.h 2020-12-11 09:16:43.519997924 +0100
@@ -8,6 +8,7 @@
#define RING_BUFFER_H_01238467085684139453534

19
FreeFileSync.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Dec 11 07:53:28 UTC 2020 - Jannik Seiler <seil0@mosad.xyz>
- Update to 11.4
- New progress graph "this one sparks joy"
- Remember progress dialog size
- New config file context menu option: Show in file manager
- Work around libcurl performance bug during FTP upload
- Only log modification time errors after comparing by size or content
- Smaller icon size for efficient screen layout (Linux)
- Use system-native recycle bin icon
- Fixed DeviceIoControl(IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS): ERROR_MORE_DATA
- Support MTP devices lacking a friendly name
- Fix grid scrolling with small mouse rotations (macOS)
- Faster mouse scrolling on high-DPI resolution displays
- Keep previous windows size when maximized during auto-exit
- use %autosetup instead of %setup and %patch
- replace %desktop_database_postun with %filetrigger{in,postun}
-------------------------------------------------------------------
Tue Nov 3 11:33:35 UTC 2020 - Jannik Seiler <seil0@mosad.xyz>

15
FreeFileSync.spec
View File

@ -17,7 +17,7 @@
Name: FreeFileSync
Version: 11.3
Version: 11.4
Release: 0
Summary: Free backup software to synchronize files and folders
License: GPL-3.0-or-later
@ -56,12 +56,9 @@ in one of the monitored directories or when a directory becomes available (e. g.
Usually this command line will trigger a FreeFileSync batch job.
%prep
%setup -q -c %{name}-%{version}
%autosetup -p1 -c %{name}-%{version}
sed -i 's/\r$//' License.txt
#chmod -x License.txt
mkdir FreeFileSync/Build/Bin
%patch0 -p1
%patch1 -p1
%build
export TMPDIR=/tmp # necessary since 11.0
@ -97,11 +94,11 @@ install -p %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/
%suse_update_desktop_file -i %{name}
%suse_update_desktop_file -i RealTimeSync
%post
%desktop_database_post
%filetriggerin -- %{_datadir}/applications
%{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true
%postun
%desktop_database_postun
%filetriggerpostun -- %{_datadir}/applications
%{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true
%files
%license %attr(444, -, -) License.txt

3
FreeFileSync_11.3_Source.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10be50759182290459048f25426fc40771339bb9bbbdfa3598bb09fe1224bc33
size 2469919

3
FreeFileSync_11.4_Source.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0c20c1388024460944bb0871e91ce6dc9ac5c02be45a095f288db169eb844b4
size 2489085