Merge branch 'freefilesync-bump' into 'master'

ffs 11.28 dpkg rc1

See merge request bgstack15/stackrpms!327

6 files changed, 91 insertions, 76 deletions

diff --git a/freefilesync/01_no_check_updates.patch b/freefilesync/01_no_check_updates.patch
index d37005d..005f662 100644
--- a/freefilesync/01_no_check_updates.patch
+++ b/freefilesync/01_no_check_updates.patch
@@ -1,5 +1,5 @@
-Version: 11.25
-Date: 2022-09-07
+Version: 11.28
+Date: 2022-11-22
 Author: bgstack15
 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.
 --- a/FreeFileSync/Source/ui/gui_generated.cpp
@@ -20,7 +20,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
      m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1132,8 +1123,6 @@
+@@ -1129,8 +1120,6 @@ MainDialogGenerated::MainDialogGenerated
      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_menuItemResetLayout->GetId());
      m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
@@ -28,7 +28,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -    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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
-     m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+     m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
 --- a/FreeFileSync/Source/ui/gui_generated.h
 +++ b/FreeFileSync/Source/ui/gui_generated.h
 @@ -96,8 +96,6 @@ protected:
@@ -40,7 +40,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      wxMenuItem* m_menuItemAbout;
      wxBoxSizer* bSizerPanelHolder;
      wxPanel* m_panelTopButtons;
-@@ -232,8 +230,6 @@ protected:
+@@ -234,8 +232,6 @@ protected:
      virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
      virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
      virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
@@ -51,7 +51,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
 --- a/FreeFileSync/Source/ui/main_dlg.cpp
 +++ b/FreeFileSync/Source/ui/main_dlg.cpp
-@@ -30,7 +30,6 @@
+@@ -31,7 +31,6 @@
  #include <wx+/window_tools.h>
  #include <wx+/image_resources.h>
  #include "cfg_grid.h"
@@ -59,7 +59,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #include "gui_status_handler.h"
  #include "small_dlgs.h"
  #include "progress_indicator.h"
-@@ -826,7 +825,6 @@ imgFileManagerSmall_([]
+@@ -830,7 +829,6 @@ imgFileManagerSmall_([]
  
      setImage(*m_menuItemHelp,            loadImage("help_sicon"));
      setImage(*m_menuItemAbout,           loadImage("about_sicon"));
@@ -67,7 +67,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      fixMenuIcons(*m_menuFile);
      fixMenuIcons(*m_menuActions);
-@@ -927,9 +925,6 @@ imgFileManagerSmall_([]
+@@ -930,9 +928,6 @@ imgFileManagerSmall_([]
      //mainly to update row label sizes...
      updateGui();
  
@@ -77,7 +77,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      //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()
-@@ -1123,8 +1118,6 @@ void MainDialog::setGlobalCfgOnInit(cons
+@@ -1126,8 +1121,6 @@ void MainDialog::setGlobalCfgOnInit(cons
      auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
      auiMgr_.GetPane(m_panelLog   ).Hide(); //
  
@@ -86,7 +86,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      auiMgr_.Update();
  }
  
-@@ -5746,72 +5739,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -5831,72 +5824,6 @@ void MainDialog::onMenuExportFileList(wx
      }
  }
  
@@ -170,9 +170,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      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(); }
---- 11.25-0/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 14:54:31.556630130 -0400
-+++ 11.25-1/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 15:24:11.648682649 -0400
-@@ -79,6 +79,8 @@
+--- a/FreeFileSync/Source/ui/version_check.cpp
++++ b/FreeFileSync/Source/ui/version_check.cpp
+@@ -79,6 +79,8 @@ void openBrowserForDownload(wxWindow* pa
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -181,7 +181,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -175,8 +174,7 @@
+@@ -175,8 +177,7 @@ void showUpdateAvailableDialog(wxWindow*
      std::wstring updateDetailsMsg;
      try
      {
@@ -191,7 +191,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      }
      catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); }
  
-@@ -198,8 +196,8 @@
+@@ -198,8 +199,8 @@ void showUpdateAvailableDialog(wxWindow*
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -202,7 +202,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      if (response.empty() ||
      !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
-@@ -239,58 +240,6 @@
+@@ -246,58 +247,6 @@ void fff::disableUpdateCheck(time_t& las
  }
  
  
@@ -275,7 +275,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #endif //VERSION_CHECK_H_324872374893274983275
 --- a/FreeFileSync/Source/Makefile
 +++ b/FreeFileSync/Source/Makefile
-@@ -77,7 +77,6 @@ cppFiles+=ui/small_dlgs.cpp
+@@ -78,7 +78,6 @@ cppFiles+=ui/small_dlgs.cpp
  cppFiles+=ui/sync_cfg.cpp
  cppFiles+=ui/tray_icon.cpp
  cppFiles+=ui/triple_splitter.cpp
@@ -285,7 +285,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  cppFiles+=../../zen/file_io.cpp
 --- a/FreeFileSync/Source/ui/small_dlgs.cpp
 +++ b/FreeFileSync/Source/ui/small_dlgs.cpp
-@@ -27,7 +27,6 @@
+@@ -26,7 +26,6 @@
  #include <wx+/image_resources.h>
  #include "gui_generated.h"
  #include "folder_selector.h"
diff --git a/freefilesync/README.md b/freefilesync/README.md
index 3fb5c4e..fadf681 100644
--- a/freefilesync/README.md
+++ b/freefilesync/README.md
@@ -23,15 +23,17 @@ Distro         | FreeFileSync version | gtk version
 CentOS 7       | 10.24                | 2
 CentOS 8       | 10.24                | 2
 Fedora 35      | 11.23                | 2
-Fedora 36      | 11.23                | 2
-Fedora Rawhide | 11.23                | 2
-Devuan Ceres   | 11.23                | 3
+Fedora 36      | 11.25                | 2
+Fedora Rawhide | 11.25                | 2
+Devuan Ceres   | 11.28                | 3
 
 ## Additional info
 Upstream officially still [uses gtk2](https://freefilesync.org/forum/viewtopic.php?t=7660&p=26079#p26063) but the code supports gtk3 starting around version 10.25. With version 10.25, only stdc++=20 is supported, so el7 cannot go any higher: I was unable to find g++-10 for el7.
 On the rpm platforms, where gtk2 is still supported as a primary environment, I compile FreeFileSync against gtk2. On Devuan where gtk2 has been obsoleted, I compile against gtk3.
 As of version 11.20 (2022-04), you need g++-11 for `-std=c++2b`.
 
+As of version 11.28, I am really only maintaining the dpkg. The rpm is not getting updated, built, tested, or used.
+
 ## CentOS compilation of freefilesync
 
 ### Dependencies to build FreeFileSync on CentOS 7
diff --git a/freefilesync/debian/_service b/freefilesync/debian/_service
index 7730365..be231e7 100644
--- a/freefilesync/debian/_service
+++ b/freefilesync/debian/_service
@@ -14,7 +14,7 @@
    <service name="tar_scm">
       <param name="scm">git</param>
       <param name="url">https://gitlab.com/opensource-tracking/FreeFileSync.git</param>
-      <param name="revision">11.27</param>
+      <param name="revision">11.28</param>
       <param name="version">_none_</param>
    </service>
    <service name="recompress">
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 5caffbd..1a1b9de 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,16 @@
+freefilesync (11.28-1+devuan) obs; urgency=low
+
+  * Upstream updates
+    * Recover from corrupted database file
+    * Save database files pair-wise as a transaction
+    * Fixed FTP access for Xiaomi "File Manager"
+    * Fixed filter full path detection for root directory (Linux/macOS)
+    * Fixed recycle bin double initialization bug (Windows)
+    * Fixed incorrect case-insensitive string comparison for i and ı
+    * Round progress percentage numbers down
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 22 Nov 2022 09:22:22
+
 freefilesync (11.27-1+devuan) obs; urgency=low
 
   * Upstream updates
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index 9035fc6..ff1bfc5 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+devuan.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: freefilesync
 Binary: freefilesync
 Architecture: any
-Version: 11.27-1+devuan
+Version: 11.28-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12~), g++-12, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.83.1-1+b1), libglibmm-2.4-dev, libssh2-1-dev (>= 1.10.0-3+b1), libssl-dev (>= 3.0.3-5), wx3.2-headers, unzip, libgtk-3-dev, libwxgtk3.2-dev, libfontconfig-dev
+Build-Depends: debhelper (>= 12~), g++-12, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.86.0-1), libglibmm-2.4-dev, libssh2-1-dev (>= 1.10.0-3+b1), libssl-dev (>= 3.0.3-5), wx3.2-headers, unzip, libgtk-3-dev, libwxgtk3.2-dev, libfontconfig-dev
 Package-List:
  freefilesync deb utils optional arch=any
 Files:
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index c540560..005f662 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,57 +1,57 @@
-Version: 11.27
-Date: 2022-10-19
+Version: 11.28
+Date: 2022-11-22
 Author: bgstack15
 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.
 --- a/FreeFileSync/Source/ui/gui_generated.cpp
 +++ b/FreeFileSync/Source/ui/gui_generated.cpp
-@@ -110,15 +110,6 @@
+@@ -110,15 +110,6 @@ MainDialogGenerated::MainDialogGenerated
  
- 	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_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_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_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 );
+     m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+     m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1129,8 +1120,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_menuItemResetLayout->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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
- 	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+@@ -1129,8 +1120,6 @@ MainDialogGenerated::MainDialogGenerated
+     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_menuItemResetLayout->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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
+     m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
 --- a/FreeFileSync/Source/ui/gui_generated.h
 +++ b/FreeFileSync/Source/ui/gui_generated.h
-@@ -96,8 +96,6 @@
- 		wxMenuItem* m_menuItemShowOverview;
- 		wxMenu* m_menuHelp;
- 		wxMenuItem* m_menuItemHelp;
--		wxMenuItem* m_menuItemCheckVersionNow;
--		wxMenuItem* m_menuItemCheckVersionAuto;
- 		wxMenuItem* m_menuItemAbout;
- 		wxBoxSizer* bSizerPanelHolder;
- 		wxPanel* m_panelTopButtons;
-@@ -234,8 +232,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(); }
+@@ -96,8 +96,6 @@ protected:
+     wxMenuItem* m_menuItemShowOverview;
+     wxMenu* m_menuHelp;
+     wxMenuItem* m_menuItemHelp;
+-    wxMenuItem* m_menuItemCheckVersionNow;
+-    wxMenuItem* m_menuItemCheckVersionAuto;
+     wxMenuItem* m_menuItemAbout;
+     wxBoxSizer* bSizerPanelHolder;
+     wxPanel* m_panelTopButtons;
+@@ -234,8 +232,6 @@ protected:
+     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(); }
 --- a/FreeFileSync/Source/ui/main_dlg.cpp
 +++ b/FreeFileSync/Source/ui/main_dlg.cpp
-@@ -30,7 +30,6 @@
+@@ -31,7 +31,6 @@
  #include <wx+/window_tools.h>
  #include <wx+/image_resources.h>
  #include "cfg_grid.h"
@@ -59,7 +59,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #include "gui_status_handler.h"
  #include "small_dlgs.h"
  #include "progress_indicator.h"
-@@ -826,7 +825,6 @@ imgFileManagerSmall_([]
+@@ -830,7 +829,6 @@ imgFileManagerSmall_([]
  
      setImage(*m_menuItemHelp,            loadImage("help_sicon"));
      setImage(*m_menuItemAbout,           loadImage("about_sicon"));
@@ -67,7 +67,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      fixMenuIcons(*m_menuFile);
      fixMenuIcons(*m_menuActions);
-@@ -927,9 +925,6 @@ imgFileManagerSmall_([]
+@@ -930,9 +928,6 @@ imgFileManagerSmall_([]
      //mainly to update row label sizes...
      updateGui();
  
@@ -77,7 +77,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      //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()
-@@ -1123,8 +1118,6 @@ void MainDialog::setGlobalCfgOnInit(cons
+@@ -1126,8 +1121,6 @@ void MainDialog::setGlobalCfgOnInit(cons
      auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
      auiMgr_.GetPane(m_panelLog   ).Hide(); //
  
@@ -86,7 +86,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      auiMgr_.Update();
  }
  
-@@ -5746,72 +5739,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -5831,72 +5824,6 @@ void MainDialog::onMenuExportFileList(wx
      }
  }
  
@@ -170,9 +170,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      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(); }
---- 11.25-0/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 14:54:31.556630130 -0400
-+++ 11.25-1/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 15:24:11.648682649 -0400
-@@ -79,6 +79,8 @@
+--- a/FreeFileSync/Source/ui/version_check.cpp
++++ b/FreeFileSync/Source/ui/version_check.cpp
+@@ -79,6 +79,8 @@ void openBrowserForDownload(wxWindow* pa
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -181,7 +181,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -175,8 +174,7 @@
+@@ -175,8 +177,7 @@ void showUpdateAvailableDialog(wxWindow*
      std::wstring updateDetailsMsg;
      try
      {
@@ -191,7 +191,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      }
      catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); }
  
-@@ -198,8 +196,8 @@
+@@ -198,8 +199,8 @@ void showUpdateAvailableDialog(wxWindow*
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -202,7 +202,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      if (response.empty() ||
      !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
-@@ -239,58 +240,6 @@
+@@ -246,58 +247,6 @@ void fff::disableUpdateCheck(time_t& las
  }
  
  
@@ -275,7 +275,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #endif //VERSION_CHECK_H_324872374893274983275
 --- a/FreeFileSync/Source/Makefile
 +++ b/FreeFileSync/Source/Makefile
-@@ -77,7 +77,6 @@ cppFiles+=ui/small_dlgs.cpp
+@@ -78,7 +78,6 @@ cppFiles+=ui/small_dlgs.cpp
  cppFiles+=ui/sync_cfg.cpp
  cppFiles+=ui/tray_icon.cpp
  cppFiles+=ui/triple_splitter.cpp
@@ -285,7 +285,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  cppFiles+=../../zen/file_io.cpp
 --- a/FreeFileSync/Source/ui/small_dlgs.cpp
 +++ b/FreeFileSync/Source/ui/small_dlgs.cpp
-@@ -27,7 +27,6 @@
+@@ -26,7 +26,6 @@
  #include <wx+/image_resources.h>
  #include "gui_generated.h"
  #include "folder_selector.h"