rpm/FreeFileSync
SHA256
1
0
Fork 0
forked from pool/FreeFileSync
Code Pull Requests Activity

Accepting request 839424 from network

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/839424
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeFileSync?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2020-10-05 17:41:02 +00:00 committed by Git OBS Bridge
commit d5a3618dfc
5 changed files with 78 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
FreeFileSync-Build.patch
View File

@ -1,10 +1,10 @@
diff -ruN FreeFileSync_11.0_Source_orig/FreeFileSync/Source/Makefile FreeFileSync_11.0_Source/FreeFileSync/Source/Makefile diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/Makefile FreeFileSync_11.2_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_11.0_Source_orig/FreeFileSync/Source/Makefile 2020-07-22 13:22:18.000000000 +0200 --- FreeFileSync_11.2_Source_orig/FreeFileSync/Source/Makefile 2020-10-02 20:14:56.000000000 +0200
+++ FreeFileSync_11.0_Source/FreeFileSync/Source/Makefile 2020-08-05 12:22:18.001794429 +0200 +++ FreeFileSync_11.2_Source/FreeFileSync/Source/Makefile 2020-10-03 10:53:29.564126702 +0200
@@ -2,9 +2,9 @@ @@ -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" \ 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 -Wshadow -Wnon-virtual-dtor \ -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
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie + -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie
@ -13,21 +13,26 @@ diff -ruN FreeFileSync_11.0_Source_orig/FreeFileSync/Source/Makefile FreeFileSyn
cxxFlags += `pkg-config --cflags openssl` cxxFlags += `pkg-config --cflags openssl`
@@ -17,6 +17,7 @@ @@ -16,9 +16,10 @@
cxxFlags += `pkg-config --cflags libssh2`
linkFlags += `pkg-config --libs libssh2` linkFlags += `pkg-config --libs libssh2`
cxxFlags += `pkg-config --cflags gtk+-2.0` -cxxFlags += `pkg-config --cflags gtk+-2.0`
+linkFlags += `pkg-config --libs 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: #treat as system headers so that warnings are hidden:
cxxFlags += -isystem/usr/include/gtk-2.0 -cxxFlags += -isystem/usr/include/gtk-2.0
+cxxFlags += -isystem/usr/include/gtk-3.0
diff -ruN FreeFileSync_11.0_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile FreeFileSync_11.0_Source/FreeFileSync/Source/RealTimeSync/Makefile #support for SELinux (optional)
--- FreeFileSync_11.0_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 13:22:18.000000000 +0200 SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
+++ FreeFileSync_11.0_Source/FreeFileSync/Source/RealTimeSync/Makefile 2020-08-05 12:22:00.473864076 +0200 diff -ruN FreeFileSync_11.2_Source_orig/FreeFileSync/Source/RealTimeSync/Makefile FreeFileSync_11.2_Source/FreeFileSync/Source/RealTimeSync/Makefile
@@ -2,12 +2,13 @@ --- 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" \ 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 -Wshadow -Wnon-virtual-dtor \ -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
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie + -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -fpie
@ -35,14 +40,18 @@ diff -ruN FreeFileSync_11.0_Source_orig/FreeFileSync/Source/RealTimeSync/Makefil
+linkFlags = -s `wx-config --libs std, aui --debug=no` -pthread -lz -pie +linkFlags = -s `wx-config --libs std, aui --debug=no` -pthread -lz -pie
#Gtk - support "no button border" #Gtk - support "no button border"
cxxFlags += `pkg-config --cflags gtk+-2.0` -cxxFlags += `pkg-config --cflags gtk+-2.0`
+linkFlags += `pkg-config --libs 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: #treat as system headers so that warnings are hidden:
cxxFlags += -isystem/usr/include/gtk-2.0 -cxxFlags += -isystem/usr/include/gtk-2.0
+cxxFlags += -isystem/usr/include/gtk-3.0
diff -ruN FreeFileSync_11.0_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.0_Source/libssh2/libssh2_wrap.h cppFiles=
--- FreeFileSync_11.0_Source_orig/libssh2/libssh2_wrap.h 2020-07-22 13:22:20.000000000 +0200 cppFiles+=application.cpp
+++ FreeFileSync_11.0_Source/libssh2/libssh2_wrap.h 2020-08-04 11:35:17.919354168 +0200 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 @@ @@ -20,6 +20,22 @@
#error libssh2_sftp.h header guard changed #error libssh2_sftp.h header guard changed
#endif #endif
@ -66,9 +75,9 @@ diff -ruN FreeFileSync_11.0_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11.0
//fix libssh2 64-bit warning mess: https://github.com/libssh2/libssh2/pull/96 //fix libssh2 64-bit warning mess: https://github.com/libssh2/libssh2/pull/96
#undef libssh2_userauth_password #undef libssh2_userauth_password
inline int libssh2_userauth_password(LIBSSH2_SESSION* session, const std::string& username, const std::string& password) inline int libssh2_userauth_password(LIBSSH2_SESSION* session, const std::string& username, const std::string& password)
diff -ruN FreeFileSync_11.0_Source_orig/zen/ring_buffer.h FreeFileSync_11.0_Source/zen/ring_buffer.h diff -ruN FreeFileSync_11.2_Source_orig/zen/ring_buffer.h FreeFileSync_11.2_Source/zen/ring_buffer.h
--- FreeFileSync_11.0_Source_orig/zen/ring_buffer.h 2020-07-22 13:22:20.000000000 +0200 --- FreeFileSync_11.2_Source_orig/zen/ring_buffer.h 2020-10-02 20:14:58.000000000 +0200
+++ FreeFileSync_11.0_Source/zen/ring_buffer.h 2020-08-04 11:35:36.075289535 +0200 +++ FreeFileSync_11.2_Source/zen/ring_buffer.h 2020-10-03 10:55:35.991520674 +0200
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#define RING_BUFFER_H_01238467085684139453534 #define RING_BUFFER_H_01238467085684139453534

41
FreeFileSync.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Sat Oct 3 08:47:24 UTC 2020 - Jannik Seiler <seil0@mosad.xyz>
- 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
-------------------------------------------------------------------
Wed Sep 2 11:06:48 UTC 2020 - Jannik Seiler <seil0@mosad.xyz>
- 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
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 5 10:00:02 UTC 2020 - Jannik Seiler <seil0@mosad.xyz> Wed Aug 5 10:00:02 UTC 2020 - Jannik Seiler <seil0@mosad.xyz>

6
FreeFileSync.spec
View File

@ -17,7 +17,7 @@
Name: FreeFileSync Name: FreeFileSync
Version: 11.0 Version: 11.2
Release: 0 Release: 0
Summary: Free backup software to synchronize files and folders Summary: Free backup software to synchronize files and folders
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -32,13 +32,13 @@ Patch0: FreeFileSync-Build.patch
Patch1: FreeFileSync-Resources.patch Patch1: FreeFileSync-Resources.patch
BuildRequires: boost-devel >= 1.54 BuildRequires: boost-devel >= 1.54
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libstdc++6 >= 10.0.0
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libssh2-devel BuildRequires: libssh2-devel
BuildRequires: libstdc++6 >= 10.0.0
BuildRequires: unzip BuildRequires: unzip
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_2-devel BuildRequires: wxGTK3-3_2-devel >= 3.1.4
%description %description
FreeFileSync is a free Open Source software that helps you synchronize files FreeFileSync is a free Open Source software that helps you synchronize files

3
FreeFileSync_11.0_Source.zip
View File

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

3
FreeFileSync_11.2_Source.zip Normal file
View File

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