SHA256
1
0
forked from pool/FreeFileSync

- Update to 12.4:

* Show dynamic error and warning count in progress dialogs
  * Show process elevation status in title bar (Administrator, root)
  * Fixed libcurl bug CURLE_URL_MALFORMAT for numerical host name
  * Don't discard config panel last log after no changes found
  * Set taskbar relaunch command to launcher executable (Windows)
  * Fixed Btrfs compression not being applied during copy (Linux)
  * Run on file systems with buggy GetFinalPathNameByHandle() implementation, e.g. Dokany-based
  * Save selected view mode (F11) in batch config file
- Rebase FreeFileSync-disable-in-app-updates.patch
- Rebase FreeFileSync-resources.patch

OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=67
This commit is contained in:
Paolo Stivanin 2023-06-28 06:59:24 +00:00 committed by Git OBS Bridge
parent e1d2cea54a
commit 6ea46d9294
6 changed files with 46 additions and 30 deletions

View File

@ -1,40 +1,40 @@
diff -ru a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
--- a/FreeFileSync/Source/ui/gui_generated.cpp 2023-05-17 09:16:56.000000000 +0200
+++ b/FreeFileSync/Source/ui/gui_generated.cpp 2023-05-20 15:07:59.726152996 +0200
--- 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 );
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();
+ // disable update/auto update actions for packaged version (they are only hidden, to not break any code and keep the patch small)
+ //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 );
+ // 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_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();
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-05-17 09:16:56.000000000 +0200
+++ b/FreeFileSync/Source/ui/main_dlg.cpp 2023-05-20 15:08:30.462446500 +0200
@@ -944,7 +944,7 @@
--- 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 @@
updateGui();
//register regular check for update on next idle event
- Bind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
+ //Bind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
//asynchronous call to wxWindow::Layout(): 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);
diff -ru a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
--- a/FreeFileSync/Source/ui/version_check.cpp 2023-05-17 09:16:56.000000000 +0200
+++ b/FreeFileSync/Source/ui/version_check.cpp 2023-05-20 15:09:02.438749959 +0200
@@ -85,7 +85,8 @@
--- 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
@@ -84,7 +84,8 @@
return false;
const time_t now = std::time(nullptr);

View File

@ -1,7 +1,8 @@
diff -Naur FreeFileSync_11.23_Source_orig/FreeFileSync/Source/ffs_paths.cpp FreeFileSync_11.23_Source/FreeFileSync/Source/ffs_paths.cpp
--- FreeFileSync_11.23_Source_orig/FreeFileSync/Source/ffs_paths.cpp 2022-07-23 15:18:28.000000000 +0200
+++ FreeFileSync_11.23_Source/FreeFileSync/Source/ffs_paths.cpp 2022-08-26 15:41:30.007973691 +0200
@@ -49,7 +49,8 @@
Index: FreeFileSync-12.4/FreeFileSync/Source/ffs_paths.cpp
===================================================================
--- FreeFileSync-12.4.orig/FreeFileSync/Source/ffs_paths.cpp
+++ FreeFileSync-12.4/FreeFileSync/Source/ffs_paths.cpp
@@ -55,7 +55,8 @@ Zstring fff::getInstallDirPath()
Zstring fff::getResourceDirPath()
{

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 28 06:51:57 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
- Update to 12.4:
* Show dynamic error and warning count in progress dialogs
* Show process elevation status in title bar (Administrator, root)
* Fixed libcurl bug CURLE_URL_MALFORMAT for numerical host name
* Don't discard config panel last log after no changes found
* Set taskbar relaunch command to launcher executable (Windows)
* Fixed Btrfs compression not being applied during copy (Linux)
* Run on file systems with buggy GetFinalPathNameByHandle() implementation, e.g. Dokany-based
* Save selected view mode (F11) in batch config file
- Rebase FreeFileSync-disable-in-app-updates.patch
- Rebase FreeFileSync-resources.patch
-------------------------------------------------------------------
Sat May 20 13:03:18 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -17,7 +17,7 @@
Name: FreeFileSync
Version: 12.3
Version: 12.4
Release: 0
Summary: Backup software to synchronize files and folders
License: GPL-3.0-or-later

View File

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

View File

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