diff --git a/FreeFileSync-build.patch b/FreeFileSync-build.patch index b11a507..6f1d6e5 100644 --- a/FreeFileSync-build.patch +++ b/FreeFileSync-build.patch @@ -1,9 +1,10 @@ -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 @@ +Index: FreeFileSync-12.5/FreeFileSync/Source/Makefile +=================================================================== +--- FreeFileSync-12.5.orig/FreeFileSync/Source/Makefile ++++ FreeFileSync-12.5/FreeFileSync/Source/Makefile +@@ -3,9 +3,9 @@ exeName = FreeFileSync_$(shell arch) - CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++23 -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 @@ -13,7 +14,7 @@ diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/Makefile FreeFileS CXXFLAGS += `pkg-config --cflags openssl` -@@ -17,9 +17,10 @@ +@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl` CXXFLAGS += `pkg-config --cflags libssh2` LDFLAGS += `pkg-config --libs libssh2` @@ -26,12 +27,13 @@ diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/Makefile FreeFileS #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 @@ +Index: FreeFileSync-12.5/FreeFileSync/Source/RealTimeSync/Makefile +=================================================================== +--- FreeFileSync-12.5.orig/FreeFileSync/Source/RealTimeSync/Makefile ++++ FreeFileSync-12.5/FreeFileSync/Source/RealTimeSync/Makefile +@@ -3,14 +3,15 @@ exeName = RealTimeSync_$(shell arch) - CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++23 -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 @@ -49,9 +51,10 @@ diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/RealTimeSync/Makef 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 +Index: FreeFileSync-12.5/libssh2/libssh2_wrap.h +=================================================================== +--- FreeFileSync-12.5.orig/libssh2/libssh2_wrap.h ++++ FreeFileSync-12.5/libssh2/libssh2_wrap.h @@ -20,6 +20,22 @@ #error libssh2_sftp.h header guard changed #endif @@ -75,9 +78,10 @@ diff -Naur FreeFileSync_11.29_Source_orig/libssh2/libssh2_wrap.h FreeFileSync_11 //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 +Index: FreeFileSync-12.5/zen/ring_buffer.h +=================================================================== +--- FreeFileSync-12.5.orig/zen/ring_buffer.h ++++ FreeFileSync-12.5/zen/ring_buffer.h @@ -8,6 +8,7 @@ #define RING_BUFFER_H_01238467085684139453534 diff --git a/FreeFileSync-disable-in-app-updates.patch b/FreeFileSync-disable-in-app-updates.patch index b47e3d2..a94ae58 100644 --- a/FreeFileSync-disable-in-app-updates.patch +++ b/FreeFileSync-disable-in-app-updates.patch @@ -1,28 +1,27 @@ -diff -ru a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp ---- a/FreeFileSync/Source/ui/gui_generated.cpp 2023-06-20 10:23:07.000000000 +0200 -+++ b/FreeFileSync/Source/ui/gui_generated.cpp 2023-06-28 08:56:38.529499152 +0200 -@@ -108,13 +108,14 @@ - m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemHelp ); +diff -ru orig/FreeFileSync/Source/ui/gui_generated.cpp mod/FreeFileSync/Source/ui/gui_generated.cpp +--- orig/FreeFileSync/Source/ui/gui_generated.cpp 2023-07-21 15:28:49.000000000 +0200 ++++ mod/FreeFileSync/Source/ui/gui_generated.cpp 2023-08-02 14:27:08.425812785 +0200 +@@ -108,13 +108,13 @@ + m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL ); + m_menuHelp->Append( m_menuItemHelp ); -- m_menuHelp->AppendSeparator(); -+ //m_menuHelp->AppendSeparator(); +- m_menuHelp->AppendSeparator(); ++ //m_menuHelp->AppendSeparator(); - m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL ); -- m_menuHelp->Append( m_menuItemCheckVersionNow ); -+ // disable update/auto update actions for packaged version (they are only hidden, to not break any code and keep the patch small) -+ //m_menuHelp->Append( m_menuItemCheckVersionNow ); + m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL ); +- m_menuHelp->Append( m_menuItemCheckVersionNow ); ++ //m_menuHelp->Append( m_menuItemCheckVersionNow ); - m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK ); -- m_menuHelp->Append( m_menuItemCheckVersionAuto ); -+ //m_menuHelp->Append( m_menuItemCheckVersionAuto ); - m_menuItemCheckVersionAuto->Check( true ); + m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK ); +- m_menuHelp->Append( m_menuItemCheckVersionAuto ); ++ //m_menuHelp->Append( m_menuItemCheckVersionAuto ); + m_menuItemCheckVersionAuto->Check( true ); - m_menuHelp->AppendSeparator(); -diff -ru a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp ---- a/FreeFileSync/Source/ui/main_dlg.cpp 2023-06-20 10:23:07.000000000 +0200 -+++ b/FreeFileSync/Source/ui/main_dlg.cpp 2023-06-28 08:57:07.697666495 +0200 -@@ -945,7 +945,7 @@ + m_menuHelp->AppendSeparator(); +diff -ru orig/FreeFileSync/Source/ui/main_dlg.cpp mod/FreeFileSync/Source/ui/main_dlg.cpp +--- orig/FreeFileSync/Source/ui/main_dlg.cpp 2023-07-21 15:28:49.000000000 +0200 ++++ mod/FreeFileSync/Source/ui/main_dlg.cpp 2023-08-02 14:27:26.222583175 +0200 +@@ -955,7 +955,7 @@ updateGui(); //register regular check for update on next idle event @@ -31,9 +30,9 @@ diff -ru a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg //asynchronous call to wxWindow::Dimensions(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this); -diff -ru a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp ---- a/FreeFileSync/Source/ui/version_check.cpp 2023-06-20 10:23:07.000000000 +0200 -+++ b/FreeFileSync/Source/ui/version_check.cpp 2023-06-28 08:58:01.869976507 +0200 +diff -ru orig/FreeFileSync/Source/ui/version_check.cpp mod/FreeFileSync/Source/ui/version_check.cpp +--- orig/FreeFileSync/Source/ui/version_check.cpp 2023-07-21 15:28:49.000000000 +0200 ++++ mod/FreeFileSync/Source/ui/version_check.cpp 2023-08-02 14:27:41.709340094 +0200 @@ -84,7 +84,8 @@ return false; diff --git a/FreeFileSync.changes b/FreeFileSync.changes index 53387a9..5b733c0 100644 --- a/FreeFileSync.changes +++ b/FreeFileSync.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Aug 2 12:20:05 UTC 2023 - Paolo Stivanin + +- Update to 12.5: + * Merge logs of individual steps (comparison, manual operation, sync) + * Show total percentage in progress dialog header + * Log and report errors during cleanup or exception handling + * Skip folder traversal if existence check fails for other side of the pair + * Automatically adapt batch options to prevent hanging a non-interactive process (Windows) + * Support path lists for external applications: %item_paths%, %local_paths%, %item_names%, %parent_paths% + * Create directory lock files with hidden attribute + * Don't clear other side when right-clicking file selection + * Fixed passive FTP when using different IP than control connection + * Work around FTP servers silently renaming unsupported characters of temporary file + ------------------------------------------------------------------- Wed Jun 28 06:51:57 UTC 2023 - Paolo Stivanin diff --git a/FreeFileSync.spec b/FreeFileSync.spec index 76a25cb..517c4b4 100644 --- a/FreeFileSync.spec +++ b/FreeFileSync.spec @@ -17,7 +17,7 @@ Name: FreeFileSync -Version: 12.4 +Version: 12.5 Release: 0 Summary: Backup software to synchronize files and folders License: GPL-3.0-or-later diff --git a/FreeFileSync_12.4_Source.zip b/FreeFileSync_12.4_Source.zip deleted file mode 100644 index 7261b5b..0000000 --- a/FreeFileSync_12.4_Source.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac7d71a74fe08165b250f724b18d86858b5475d4c6ac40f174bfee383babbc3a -size 2710695 diff --git a/FreeFileSync_12.5_Source.zip b/FreeFileSync_12.5_Source.zip new file mode 100644 index 0000000..ece5fce --- /dev/null +++ b/FreeFileSync_12.5_Source.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29337f1db34b3fffb3e6baf2a77c03468e9cee5d37be2ead53109764f3065283 +size 2735308