FreeFileSync/FreeFileSync-disable-in-app-updates.patch
Jannik Seiler f0a167fc8c Accepting request 948470 from home:seil0:branches:network
- Update to 11.16
  - Allow to select and remove invalid config file
  - Migrated all HTTPS requests to use libcurl (Linux, macOS)
  - Set keyboard focus on config panel after startup
  - Added computer name to log file trailer
  - Context menu instead of confirmation dialog for swap sides
  - Fixed config selection lost after auto-cleaning obsolete rows
  - Install app files with owner set to root (Linux)
  - Don't override keyboard shortcut "CTRL + W" (macOS)
  - Migrated key conversion routines deprecated in OpenSSL 3.0
  - Boxed app icon to fit OS theme (macOS)
  - Fixed manual retry after automatic update check error
  - Fixed missing ampersands in middle grid tooltip
- Changes from 11.15
  - Play sound reminder when waiting for user confirmation
  - Enhanced crash diagnostics with known triggers
  - Defer reporting third-party incompatibilities until after crashing
  - Fixed Server 2019 not being detected for log file
  - Use native representation for modified config (macOS)
  - Improved WinMerge detection for external app integration
- Changes from 11.14
  - Authenticate (S)FTP connections using OpenSSL 3.0
  - Fixed E_NOINTERFACE error after synchronization
  - Preempt crashes due to Nahimic Sonic Studio 3
  - Hide main window when minimizing progress window (macOS)
  - Avoid second dock icon when minimizing progress window (macOS)
- Add FreeFileSync-openssl-1.1.1.patch to fix build with openssl 1.1.1
- Update FreeFileSync-disable-in-app-updates.patch for version 11.16
- Rename FreeFileSync-Build.patch to FreeFileSync-build.patch
- Rename FreeFileSync-icon_loader.patch to FreeFileSync-icon-loader.patch
- Rename FreeFileSync-Resources.patch to FreeFileSync-resources.patch

OBS-URL: https://build.opensuse.org/request/show/948470
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=53
2022-01-24 19:21:54 +00:00

48 lines
2.7 KiB
Diff

diff -Naur FreeFileSync_11.16_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp FreeFileSync_11.16_Source/FreeFileSync/Source/ui/gui_generated.cpp
--- FreeFileSync_11.16_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp 2022-01-02 18:32:20.000000000 +0100
+++ FreeFileSync_11.16_Source/FreeFileSync/Source/ui/gui_generated.cpp 2022-01-16 18:08:11.272184873 +0100
@@ -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_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_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_menuHelp->AppendSeparator();
diff -Naur FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp FreeFileSync_11.13_Source/FreeFileSync/Source/ui/main_dlg.cpp
--- FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp 2021-08-17 09:48:08.000000000 +0200
+++ FreeFileSync_11.13_Source/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-16 17:27:16.593500053 +0100
@@ -845,7 +845,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
Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
diff -Naur FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/version_check.cpp FreeFileSync_11.13_Source/FreeFileSync/Source/ui/version_check.cpp
--- FreeFileSync_11.13_Source_orig/FreeFileSync/Source/ui/version_check.cpp 2022-01-16 17:31:51.876901517 +0100
+++ FreeFileSync_11.13_Source/FreeFileSync/Source/ui/version_check.cpp 2022-01-16 17:32:03.004877442 +0100
@@ -77,7 +77,9 @@
return false;
const time_t now = std::time(nullptr);
- return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+ //return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+
+ return false;
}