From 74fb81ab33c45712555ab8fbc351f438501c4f775e3e9bb181b97c42819dd32c Mon Sep 17 00:00:00 2001 From: Paolo Stivanin Date: Tue, 28 Nov 2023 07:05:52 +0000 Subject: [PATCH] - Update to 13.2: * Prevent files from being moved to versioning recursively * Return first FTP parsing error when trying multiple variants * Allow file times from the future for Linux-style FTP listing OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=76 --- FreeFileSync-disable-in-app-updates.patch | 43 ++++++++++++----------- FreeFileSync-icon-loader.patch | 6 ++-- FreeFileSync.changes | 8 +++++ FreeFileSync.spec | 2 +- FreeFileSync_13.1_Source.zip | 3 -- FreeFileSync_13.2_Source.zip | 3 ++ 6 files changed, 38 insertions(+), 27 deletions(-) delete mode 100644 FreeFileSync_13.1_Source.zip create mode 100644 FreeFileSync_13.2_Source.zip diff --git a/FreeFileSync-disable-in-app-updates.patch b/FreeFileSync-disable-in-app-updates.patch index de58faa..4559c00 100644 --- a/FreeFileSync-disable-in-app-updates.patch +++ b/FreeFileSync-disable-in-app-updates.patch @@ -1,23 +1,25 @@ -diff -ru orig/FreeFileSync/Source/ui/gui_generated.cpp mod/FreeFileSync/Source/ui/gui_generated.cpp ---- orig/FreeFileSync/Source/ui/gui_generated.cpp 2023-10-23 19:11:01.000000000 +0200 -+++ mod/FreeFileSync/Source/ui/gui_generated.cpp 2023-11-06 08:14:50.253320546 +0100 -@@ -108,10 +108,10 @@ - m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemHelp ); +Index: FreeFileSync-13.2/FreeFileSync/Source/ui/gui_generated.cpp +=================================================================== +--- FreeFileSync-13.2.orig/FreeFileSync/Source/ui/gui_generated.cpp ++++ FreeFileSync-13.2/FreeFileSync/Source/ui/gui_generated.cpp +@@ -108,10 +108,10 @@ MainDialogGenerated::MainDialogGenerated + 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 ); -+ //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_menuHelp->AppendSeparator(); + 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-10-23 19:11:01.000000000 +0200 -+++ mod/FreeFileSync/Source/ui/main_dlg.cpp 2023-11-06 08:15:07.343421717 +0100 -@@ -972,7 +972,7 @@ +Index: FreeFileSync-13.2/FreeFileSync/Source/ui/main_dlg.cpp +=================================================================== +--- FreeFileSync-13.2.orig/FreeFileSync/Source/ui/main_dlg.cpp ++++ FreeFileSync-13.2/FreeFileSync/Source/ui/main_dlg.cpp +@@ -972,7 +972,7 @@ imgFileManagerSmall_([] updateGui(); //register regular check for update on next idle event @@ -26,10 +28,11 @@ diff -ru orig/FreeFileSync/Source/ui/main_dlg.cpp mod/FreeFileSync/Source/ui/mai //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 orig/FreeFileSync/Source/ui/version_check.cpp mod/FreeFileSync/Source/ui/version_check.cpp ---- orig/FreeFileSync/Source/ui/version_check.cpp 2023-10-23 19:11:01.000000000 +0200 -+++ mod/FreeFileSync/Source/ui/version_check.cpp 2023-11-06 08:15:30.556892464 +0100 -@@ -47,7 +47,8 @@ +Index: FreeFileSync-13.2/FreeFileSync/Source/ui/version_check.cpp +=================================================================== +--- FreeFileSync-13.2.orig/FreeFileSync/Source/ui/version_check.cpp ++++ FreeFileSync-13.2/FreeFileSync/Source/ui/version_check.cpp +@@ -47,7 +47,8 @@ void openBrowserForDownload(wxWindow* pa bool fff::automaticUpdateCheckDue(time_t lastUpdateCheck) { const time_t now = std::time(nullptr); diff --git a/FreeFileSync-icon-loader.patch b/FreeFileSync-icon-loader.patch index e6c5a48..8c6447d 100644 --- a/FreeFileSync-icon-loader.patch +++ b/FreeFileSync-icon-loader.patch @@ -1,7 +1,7 @@ -Index: FreeFileSync-12.3/FreeFileSync/Source/base/icon_loader.cpp +Index: FreeFileSync-13.2/FreeFileSync/Source/base/icon_loader.cpp =================================================================== ---- FreeFileSync-12.3.orig/FreeFileSync/Source/base/icon_loader.cpp -+++ FreeFileSync-12.3/FreeFileSync/Source/base/icon_loader.cpp +--- FreeFileSync-13.2.orig/FreeFileSync/Source/base/icon_loader.cpp ++++ FreeFileSync-13.2/FreeFileSync/Source/base/icon_loader.cpp @@ -227,7 +227,7 @@ FileIconHolder fff::getFileIcon(const Zs //the remaining icon types won't block! assert(GDK_IS_PIXBUF(gicon) || G_IS_THEMED_ICON(gicon) || G_IS_EMBLEMED_ICON(gicon)); diff --git a/FreeFileSync.changes b/FreeFileSync.changes index 26c247a..85d8fc5 100644 --- a/FreeFileSync.changes +++ b/FreeFileSync.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 28 07:00:43 UTC 2023 - Paolo Stivanin + +- Update to 13.2: + * Prevent files from being moved to versioning recursively + * Return first FTP parsing error when trying multiple variants + * Allow file times from the future for Linux-style FTP listing + ------------------------------------------------------------------- Mon Nov 6 07:08:54 UTC 2023 - Paolo Stivanin diff --git a/FreeFileSync.spec b/FreeFileSync.spec index 08e61bc..0c297d3 100644 --- a/FreeFileSync.spec +++ b/FreeFileSync.spec @@ -21,7 +21,7 @@ %endif Name: FreeFileSync -Version: 13.1 +Version: 13.2 Release: 0 Summary: Backup software to synchronize files and folders License: GPL-3.0-or-later diff --git a/FreeFileSync_13.1_Source.zip b/FreeFileSync_13.1_Source.zip deleted file mode 100644 index cf246e5..0000000 --- a/FreeFileSync_13.1_Source.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6e25039e8266473ec0a6254d9a9130f89d0874e4cfaba678d05447abdf74829 -size 2759227 diff --git a/FreeFileSync_13.2_Source.zip b/FreeFileSync_13.2_Source.zip new file mode 100644 index 0000000..299576e --- /dev/null +++ b/FreeFileSync_13.2_Source.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dbdc390774836d839bcdb3a21c0872b181288de6eff6918f15f059eae721423 +size 2759779