forked from pool/FreeFileSync
- 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
This commit is contained in:
parent
abe3926a10
commit
74fb81ab33
@ -1,23 +1,25 @@
|
|||||||
diff -ru orig/FreeFileSync/Source/ui/gui_generated.cpp mod/FreeFileSync/Source/ui/gui_generated.cpp
|
Index: FreeFileSync-13.2/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
|
--- FreeFileSync-13.2.orig/FreeFileSync/Source/ui/gui_generated.cpp
|
||||||
@@ -108,10 +108,10 @@
|
+++ FreeFileSync-13.2/FreeFileSync/Source/ui/gui_generated.cpp
|
||||||
m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
|
@@ -108,10 +108,10 @@ MainDialogGenerated::MainDialogGenerated
|
||||||
m_menuHelp->Append( m_menuItemHelp );
|
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_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->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
|
Index: FreeFileSync-13.2/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
|
--- FreeFileSync-13.2.orig/FreeFileSync/Source/ui/main_dlg.cpp
|
||||||
@@ -972,7 +972,7 @@
|
+++ FreeFileSync-13.2/FreeFileSync/Source/ui/main_dlg.cpp
|
||||||
|
@@ -972,7 +972,7 @@ imgFileManagerSmall_([]
|
||||||
updateGui();
|
updateGui();
|
||||||
|
|
||||||
//register regular check for update on next idle event
|
//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
|
//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);
|
Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
|
||||||
diff -ru orig/FreeFileSync/Source/ui/version_check.cpp mod/FreeFileSync/Source/ui/version_check.cpp
|
Index: FreeFileSync-13.2/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
|
--- FreeFileSync-13.2.orig/FreeFileSync/Source/ui/version_check.cpp
|
||||||
@@ -47,7 +47,8 @@
|
+++ FreeFileSync-13.2/FreeFileSync/Source/ui/version_check.cpp
|
||||||
|
@@ -47,7 +47,8 @@ void openBrowserForDownload(wxWindow* pa
|
||||||
bool fff::automaticUpdateCheckDue(time_t lastUpdateCheck)
|
bool fff::automaticUpdateCheckDue(time_t lastUpdateCheck)
|
||||||
{
|
{
|
||||||
const time_t now = std::time(nullptr);
|
const time_t now = std::time(nullptr);
|
||||||
|
@ -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-13.2.orig/FreeFileSync/Source/base/icon_loader.cpp
|
||||||
+++ FreeFileSync-12.3/FreeFileSync/Source/base/icon_loader.cpp
|
+++ FreeFileSync-13.2/FreeFileSync/Source/base/icon_loader.cpp
|
||||||
@@ -227,7 +227,7 @@ FileIconHolder fff::getFileIcon(const Zs
|
@@ -227,7 +227,7 @@ FileIconHolder fff::getFileIcon(const Zs
|
||||||
//the remaining icon types won't block!
|
//the remaining icon types won't block!
|
||||||
assert(GDK_IS_PIXBUF(gicon) || G_IS_THEMED_ICON(gicon) || G_IS_EMBLEMED_ICON(gicon));
|
assert(GDK_IS_PIXBUF(gicon) || G_IS_THEMED_ICON(gicon) || G_IS_EMBLEMED_ICON(gicon));
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 28 07:00:43 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- 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 <info@paolostivanin.com>
|
Mon Nov 6 07:08:54 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: FreeFileSync
|
Name: FreeFileSync
|
||||||
Version: 13.1
|
Version: 13.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Backup software to synchronize files and folders
|
Summary: Backup software to synchronize files and folders
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c6e25039e8266473ec0a6254d9a9130f89d0874e4cfaba678d05447abdf74829
|
|
||||||
size 2759227
|
|
3
FreeFileSync_13.2_Source.zip
Normal file
3
FreeFileSync_13.2_Source.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1dbdc390774836d839bcdb3a21c0872b181288de6eff6918f15f059eae721423
|
||||||
|
size 2759779
|
Loading…
Reference in New Issue
Block a user