summaryrefslogtreecommitdiff
path: root/freefilesync/debian
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-05-10 11:04:21 -0400
committerB. Stack <bgstack15@gmail.com>2021-05-10 11:04:21 -0400
commitfde0161f64df561a7ad391191852e1c48cf81e8e (patch)
treee66b30de714633a8f084170b4dd28b9a157937aa /freefilesync/debian
parentWIP: ffs dpkg all patches work (diff)
downloadstackrpms-fde0161f64df561a7ad391191852e1c48cf81e8e.tar.gz
stackrpms-fde0161f64df561a7ad391191852e1c48cf81e8e.tar.bz2
stackrpms-fde0161f64df561a7ad391191852e1c48cf81e8e.zip
dpkg rc1
Diffstat (limited to 'freefilesync/debian')
-rw-r--r--freefilesync/debian/patches/ffs_no_check_updates.patch278
1 files changed, 232 insertions, 46 deletions
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 00cfb2b..c0c4fc2 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,45 +1,177 @@
Version: 11.10
-diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/main_dlg.cpp 11.4-1/FreeFileSync/Source/ui/main_dlg.cpp
---- 11.4-0/FreeFileSync/Source/ui/main_dlg.cpp 2020-12-08 08:15:29.432156507 -0500
-+++ 11.4-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-12-08 18:29:47.210277596 -0500
-@@ -5552,7 +5552,7 @@
- globalCfg_.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
+Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program.
+Date: 2021-05-10
+Author: bgstack15
+diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.10-2/FreeFileSync/Source/ui/gui_generated.cpp
+--- 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 2021-05-10 08:10:14.747776591 -0400
++++ 11.10-2/FreeFileSync/Source/ui/gui_generated.cpp 2021-05-10 10:41:28.446374196 -0400
+@@ -109,17 +109,6 @@
+ m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+ m_menuHelp->Append( m_menuItemHelp );
- m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.lastUpdateCheck));
+- m_menuHelp->AppendSeparator();
-
-+ /*
- if (shouldRunAutomaticUpdateCheck(globalCfg_.lastUpdateCheck))
+- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
+- 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_menuItemCheckVersionAuto->Check( true );
+-
+- m_menuHelp->AppendSeparator();
+-
+ m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+ m_menuHelp->Append( m_menuItemAbout );
+
+@@ -1140,8 +1129,6 @@
+ m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
+ m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItem51->GetId());
+ m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
+- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
+- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
+ m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
+ m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+ m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h
+--- 11.10-1/FreeFileSync/Source/ui/gui_generated.h 2021-05-10 08:10:14.747776591 -0400
++++ 11.10-2/FreeFileSync/Source/ui/gui_generated.h 2021-05-10 10:52:32.132708289 -0400
+@@ -92,8 +92,6 @@
+ wxMenuItem* m_menuItemShowOverview;
+ wxMenu* m_menuHelp;
+ wxMenuItem* m_menuItemHelp;
+- wxMenuItem* m_menuItemCheckVersionNow;
+- wxMenuItem* m_menuItemCheckVersionAuto;
+ wxMenuItem* m_menuItemAbout;
+ wxBoxSizer* bSizerPanelHolder;
+ wxPanel* m_panelTopButtons;
+@@ -228,8 +226,6 @@
+ virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
+- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
+ virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp
+--- 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 2021-05-10 10:43:26.103497095 -0400
++++ 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp 2021-05-10 10:52:37.904763378 -0400
+@@ -706,7 +706,6 @@
+
+ m_menuItemHelp ->SetBitmap(loadImage("help_sicon"));
+ m_menuItemAbout->SetBitmap(loadImage("about_sicon"));
+- m_menuItemCheckVersionNow->SetBitmap(loadImage("update_check_sicon"));
+
+ auto fixMenuIcons = [](wxMenu& menu) //GTK: image must be set *before* adding wxMenuItem to menu or it won't show
{
- flashStatusInformation(_("Searching for program updates..."));
-@@ -5560,6 +5560,7 @@
- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion,
- automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get());
- }
-+ */
- }
+@@ -825,9 +824,6 @@
+ //mainly to update row label sizes...
+ updateGui();
+- //register regular check for update on next idle event
+- 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);
+ wxCommandEvent evtDummy; //call once before onLayoutWindowAsync()
+@@ -1078,8 +1074,6 @@
+ auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
+ auiMgr_.GetPane(m_panelLog ).Hide(); //
-@@ -5583,7 +5584,7 @@
- m_menubar->Append(menu, blackStar + L' ' + replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(globalCfg_.lastOnlineVersion)) + L' ' + blackStar);
- }
- };
+- m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.lastUpdateCheck));
-
-+ /*
- if (shouldRunAutomaticUpdateCheck(globalCfg_.lastUpdateCheck))
- {
- flashStatusInformation(_("Searching for program updates..."));
-@@ -5600,6 +5601,7 @@
+ auiMgr_.Update();
+ }
+
+@@ -5601,72 +5595,6 @@
}
- else
- showNewVersionReminder();
-+ */
}
-
-diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/Source/ui/version_check.cpp
---- 11.7-0/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:21:26.820360086 -0500
-+++ 11.7-1/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:49:29.535590111 -0500
-@@ -70,6 +70,8 @@
+-
+-void MainDialog::onMenuCheckVersion(wxCommandEvent& event)
+-{
+- checkForUpdateNow(*this, globalCfg_.lastOnlineVersion);
+-}
+-
+-
+-void MainDialog::onMenuCheckVersionAutomatically(wxCommandEvent& event)
+-{
+- if (updateCheckActive(globalCfg_.lastUpdateCheck))
+- disableUpdateCheck(globalCfg_.lastUpdateCheck);
+- else
+- globalCfg_.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
+-
+- m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.lastUpdateCheck));
+-
+- if (shouldRunAutomaticUpdateCheck(globalCfg_.lastUpdateCheck))
+- {
+- flashStatusInformation(_("Searching for program updates..."));
+- //synchronous update check is sufficient here:
+- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion,
+- automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get());
+- }
+-}
+-
+-
+-void MainDialog::onStartupUpdateCheck(wxIdleEvent& event)
+-{
+- //execute just once per startup!
+- [[maybe_unused]] bool ubOk = Unbind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
+- assert(ubOk);
+-
+- auto showNewVersionReminder = [this]
+- {
+- if (!globalCfg_.lastOnlineVersion.empty() && haveNewerVersionOnline(globalCfg_.lastOnlineVersion))
+- {
+- auto menu = new wxMenu();
+- wxMenuItem* newItem = new wxMenuItem(menu, wxID_ANY, _("&Show details"));
+- Bind(wxEVT_COMMAND_MENU_SELECTED, [this](wxCommandEvent&) { checkForUpdateNow(*this, globalCfg_.lastOnlineVersion); }, newItem->GetId());
+- //show changelog + handle Donation Edition auto-updater (including expiration)
+- menu->Append(newItem); //pass ownership
+-
+- const std::wstring& blackStar = utfTo<std::wstring>("★");
+- m_menubar->Append(menu, blackStar + L' ' + replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(globalCfg_.lastOnlineVersion)) + L' ' + blackStar);
+- }
+- };
+-
+- if (shouldRunAutomaticUpdateCheck(globalCfg_.lastUpdateCheck))
+- {
+- flashStatusInformation(_("Searching for program updates..."));
+-
+- std::shared_ptr<const UpdateCheckResultPrep> resultPrep = automaticUpdateCheckPrepare(*this); //run on main thread:
+-
+- guiQueue_.processAsync([resultPrep] { return automaticUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check)
+- [this, showNewVersionReminder] (std::shared_ptr<const UpdateCheckResult>&& resultAsync)
+- {
+- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion,
+- resultAsync.get()); //run on main thread:
+- showNewVersionReminder();
+- });
+- }
+- else
+- showNewVersionReminder();
+-}
+-
+-
+ void MainDialog::onLayoutWindowAsync(wxIdleEvent& event)
+ {
+ //execute just once per startup!
+diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.h 11.10-2/FreeFileSync/Source/ui/main_dlg.h
+--- 11.10-1/FreeFileSync/Source/ui/main_dlg.h 2021-05-10 08:02:46.059494398 -0400
++++ 11.10-2/FreeFileSync/Source/ui/main_dlg.h 2021-05-10 10:52:28.108669884 -0400
+@@ -266,8 +266,6 @@
+ void onMenuExportFileList (wxCommandEvent& event) override;
+ void onMenuResetLayout (wxCommandEvent& event) override { resetLayout(); }
+ void onMenuFindItem (wxCommandEvent& event) override { showFindPanel(true /*show*/); } //CTRL + F
+- void onMenuCheckVersion (wxCommandEvent& event) override;
+- void onMenuCheckVersionAutomatically(wxCommandEvent& event) override;
+ void onMenuAbout (wxCommandEvent& event) override;
+ void onShowHelp (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); }
+ void onMenuQuit (wxCommandEvent& event) override { Close(); }
+diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/Source/ui/version_check.cpp
+--- 11.10-1/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 08:10:14.751776629 -0400
++++ 11.10-2/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 10:50:08.595338399 -0400
+@@ -73,6 +73,8 @@
bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
{
@@ -48,7 +180,7 @@ diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/So
if (lastUpdateCheck == getVersionCheckInactiveId())
return false;
-@@ -159,8 +161,7 @@
+@@ -158,8 +160,7 @@
std::wstring updateDetailsMsg;
try
{
@@ -69,21 +201,75 @@ diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/So
if (response.empty() ||
!std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
-@@ -226,13 +226,13 @@
- const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError
- lastOnlineVersion = onlineVersion;
+@@ -226,58 +227,6 @@
+ }
+
+-void fff::checkForUpdateNow(wxWindow& parent, std::string& lastOnlineVersion)
+-{
+- try
+- {
+- const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError
+- lastOnlineVersion = onlineVersion;
+-
- if (haveNewerVersionOnline(onlineVersion))
- showUpdateAvailableDialog(&parent, onlineVersion);
- else
-+ //if (haveNewerVersionOnline(onlineVersion))
-+ // showUpdateAvailableDialog(&parent, onlineVersion);
-+ //else
- showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg().
- setIcon(loadImage("update_check")).
- setTitle(_("Check for Program Updates")).
+- showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg().
+- setIcon(loadImage("update_check")).
+- setTitle(_("Check for Program Updates")).
- setMainInstructions(_("FreeFileSync is up to date.")));
-+ setMainInstructions(_("Use your package manager for any updates to FreeFileSync.")));
- }
- catch (const SysError& e)
- {
+- }
+- catch (const SysError& e)
+- {
+- if (internetIsAlive())
+- {
+- lastOnlineVersion = "Unknown";
+-
+- switch (showConfirmationDialog(&parent, DialogInfoType::error, PopupDialogCfg().
+- setTitle(_("Check for Program Updates")).
+- setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")).
+- setDetailInstructions(e.toString()), _("&Check"), _("&Retry")))
+- {
+- case ConfirmationButton2::accept:
+- wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php");
+- break;
+- case ConfirmationButton2::accept2: //retry
+- checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!!
+- break;
+- case ConfirmationButton2::cancel:
+- break;
+- }
+- }
+- else
+- switch (showConfirmationDialog(&parent, DialogInfoType::error, PopupDialogCfg().
+- setTitle(_("Check for Program Updates")).
+- setMainInstructions(replaceCpy(_("Unable to connect to %x."), L"%x", L"freefilesync.org")).
+- setDetailInstructions(e.toString()), _("&Retry")))
+- {
+- case ConfirmationButton::accept: //retry
+- checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!!
+- break;
+- case ConfirmationButton::cancel:
+- break;
+- }
+- }
+-}
+-
+-
+ struct fff::UpdateCheckResultPrep
+ {
+ std::vector<std::pair<std::string, std::string>> postParameters;
+diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.h 11.10-2/FreeFileSync/Source/ui/version_check.h
+--- 11.10-1/FreeFileSync/Source/ui/version_check.h 2021-05-10 08:02:46.067494474 -0400
++++ 11.10-2/FreeFileSync/Source/ui/version_check.h 2021-05-10 10:50:22.035466671 -0400
+@@ -32,9 +32,6 @@
+ void automaticUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion,
+ const UpdateCheckResult* asyncResult);
+ //----------------------------------------------------------------------------
+-//call from main thread:
+-void checkForUpdateNow(wxWindow& parent, std::string& lastOnlineVersion);
+-//----------------------------------------------------------------------------
+ }
+
+ #endif //VERSION_CHECK_H_324872374893274983275
bgstack15