ffs 11.23 dpkg rc1

5 files changed, 57 insertions, 90 deletions

diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index 65226bb..dfe2c55 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -1,10 +1,9 @@
 Version: 11.22
 Date: 2022-06-26
 Message: The source release appears not to actually include the logic that performs operations in parallel, so this patch doesn't actually do anything.
-diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp
---- 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 08:15:29.428156465 -0500
-+++ 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 19:12:09.205183330 -0500
-@@ -256,7 +256,7 @@
+--- a/FreeFileSync/Source/ui/folder_selector.cpp
++++ b/FreeFileSync/Source/ui/folder_selector.cpp
+@@ -263,7 +263,7 @@ void FolderSelector::onSelectFolder(wxCo
  void FolderSelector::onSelectAltFolder(wxCommandEvent& event)
  {
      Zstring folderPathPhrase = getPath();
@@ -13,10 +12,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/fold
  
      if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, static_cast<bool>(setDeviceParallelOps_)) != ConfirmationButton::accept)
          return;
-diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp	2020-12-08 08:15:29.432156507 -0500
-+++ 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp	2020-12-08 19:07:22.970153675 -0500
-@@ -370,11 +370,14 @@
+--- a/FreeFileSync/Source/ui/small_dlgs.cpp
++++ b/FreeFileSync/Source/ui/small_dlgs.cpp
+@@ -371,11 +371,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p
  
      m_spinCtrlConnectionCount->SetValue(parallelOps);
  
@@ -35,7 +33,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/smal
      //---------------------------------------------------------
  
      //set up default view for dialog size calculation
-@@ -807,7 +810,7 @@
+@@ -821,7 +824,7 @@ CopyToDialog::CopyToDialog(wxWindow* par
  
      targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath,
                                                      targetFolderLastSelected, sftpKeyFileLastSelected, nullptr /*staticText*/, nullptr /*wxWindow*/, nullptr /*droppedPathsFilter*/,
@@ -44,10 +42,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/smal
  
      m_targetFolderPath->setHistory(std::make_shared<HistoryList>(folderHistory, folderHistoryMax));
  
-diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/sync_cfg.cpp 11.4-1/FreeFileSync/Source/ui/sync_cfg.cpp
---- 11.22-0/FreeFileSync/Source/ui/sync_cfg.cpp	2022-06-26 12:01:15.638291465 -0400
-+++ 11.22-1/FreeFileSync/Source/ui/sync_cfg.cpp	2022-06-26 12:42:38.181161442 -0400
-@@ -352,7 +352,7 @@
+--- a/FreeFileSync/Source/ui/sync_cfg.cpp
++++ b/FreeFileSync/Source/ui/sync_cfg.cpp
+@@ -352,7 +352,7 @@ emailHistoryOut_(emailHistory),
  commandHistoryOut_(commandHistory),
  globalPairCfg_(globalPairCfg),
  localPairCfg_(localPairCfg),
@@ -56,4 +53,3 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/sync
  showMultipleCfgs_(showMultipleCfgs),
  globalLogFolderPhrase_(globalLogFolderPhrase)
  {
-
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index 06de345..3607567 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -61,30 +61,6 @@ diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/RealTimeSyn
  
  #Gtk - support "no button border"
  cxxFlags  += `pkg-config --cflags gtk+-2.0`
-Message: Fix some sloppiness by Zenju.
-diff -Naur -x '*.orig' -x '*.rej' -x .git 11.21-0/FreeFileSync/Source/application.cpp 11.21-1/FreeFileSync/Source/application.cpp
---- 11.21-0/FreeFileSync/Source/application.cpp	2022-05-22 17:09:32.234809499 -0400
-+++ 11.21-1/FreeFileSync/Source/application.cpp	2022-05-24 08:36:51.949159500 -0400
-@@ -92,7 +92,7 @@
-         ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error));
- 
-         ::gtk_css_provider_load_from_path(provider, //GtkCssProvider* css_provider,
--                                          (getResourceDirPf() + fileName).c_str(), //const gchar* path,
-+                                          (getResourceDirPath() + fileName).c_str(), //const gchar* path,
-                                           &error); //GError** error
-         if (error)
-             throw SysError(formatGlibError("gtk_css_provider_load_from_path", error));
---- 11.21-0/FreeFileSync/Source/RealTimeSync/application.cpp	2022-05-22 17:09:32.226809398 -0400
-+++ 11.21-1/FreeFileSync/Source/RealTimeSync/application.cpp	2022-05-25 09:15:00.262617987 -0400
-@@ -68,7 +68,7 @@
-         ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error));
- 
-         ::gtk_css_provider_load_from_path(provider, //GtkCssProvider* css_provider,
--                                          (fff::getResourceDirPf() + fileName).c_str(), //const gchar* path,
-+                                          (fff::getResourceDirPath() + fileName).c_str(), //const gchar* path,
-                                           &error); //GError** error
-         if (error)
-             throw SysError(formatGlibError("gtk_css_provider_load_from_path", error));
 Message: some random sloppiness with a missing graphical asset. It's not important to the application.
 --- 11.22-0/FreeFileSync/Source/ui/small_dlgs.cpp	2022-06-26 16:03:49.887270966 -0400
 +++ 11.22-1/FreeFileSync/Source/ui/small_dlgs.cpp	2022-06-26 16:03:52.123298767 -0400
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 1d11f96..3a11dca 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,56 +1,56 @@
-Version: 11.22
-Date: 2022-06-26
+Version: 11.23
+Date: 2022-08-03
 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.
 diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp
---- 11.22-0/FreeFileSync/Source/ui/gui_generated.cpp	2022-06-26 12:01:15.634291415 -0400
-+++ 11.22-1/FreeFileSync/Source/ui/gui_generated.cpp	2022-06-26 12:39:05.058511306 -0400
+--- 11.23-0/FreeFileSync/Source/ui/gui_generated.cpp	2022-08-03 08:55:32.136102940 -0400
++++ 11.23-1/FreeFileSync/Source/ui/gui_generated.cpp	2022-08-03 08:58:06.653976661 -0400
 @@ -110,15 +110,6 @@
  
- 	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 );
  
 @@ -1131,8 +1122,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_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
- 	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+     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_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.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/Source/ui/gui_generated.h
---- 11.22-0/FreeFileSync/Source/ui/gui_generated.h	2022-06-26 12:01:15.634291415 -0400
-+++ 11.22-1/FreeFileSync/Source/ui/gui_generated.h	2022-06-26 12:38:30.522081852 -0400
+--- 11.23-0/FreeFileSync/Source/ui/gui_generated.h	2022-08-03 08:55:32.136102940 -0400
++++ 11.23-1/FreeFileSync/Source/ui/gui_generated.h	2022-08-03 08:57:44.669710074 -0400
 @@ -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;
+     wxMenuItem* m_menuItemShowOverview;
+     wxMenu* m_menuHelp;
+     wxMenuItem* m_menuItemHelp;
+-    wxMenuItem* m_menuItemCheckVersionNow;
+-    wxMenuItem* m_menuItemCheckVersionAuto;
+     wxMenuItem* m_menuItemAbout;
+     wxBoxSizer* bSizerPanelHolder;
+     wxPanel* m_panelTopButtons;
 @@ -232,8 +230,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(); }
+     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.16-0/FreeFileSync/Source/ui/main_dlg.cpp	2022-01-04 08:52:19.811432573 -0500
 +++ 11.16-1/FreeFileSync/Source/ui/main_dlg.cpp	2022-01-04 08:57:14.506728896 -0500
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index 4758004..8231585 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -1,6 +1,6 @@
 Message: Some of these can be traced back to version 10.23 which was the last to not use <unordered_map>
-Date: 2022-06-26
-Version: 11.22
+Date: 2022-08-03
+Version: 11.23
 Author: bgstack15
 diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h
 --- 10.24-0/wx+/choice_enum.h	2020-05-17 18:30:59.441499418 -0400
@@ -171,8 +171,8 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu
          //draw rectangle border with gradient
          const wxColor colFrom = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
 diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h
---- 11.21-0/wx+/dc.h	2022-05-22 17:09:32.250809701 -0400
-+++ 11.21-1/wx+/dc.h	2022-05-22 20:28:53.788193992 -0400
+--- 11.23-0/wx+/dc.h	2022-08-03 08:55:32.140102989 -0400
++++ 11.23-1/wx+/dc.h	2022-08-03 09:27:55.367666939 -0400
 @@ -12,7 +12,7 @@
  #include <zen/basic_math.h>
  #include <wx/dcbuffer.h> //for macro: wxALWAYS_NATIVE_DOUBLE_BUFFER
@@ -192,17 +192,12 @@ diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/
      //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114
      //=> requires general fix at wxWidgets-level
  
-@@ -126,11 +123,10 @@
- 
- 
- inline
--wxBitmapBundle toBitmapBundle(const wxImage& img /*expected to be DPI-scaled!*/)
-+wxBitmap toBitmapBundle(const wxImage& img /*expected to be DPI-scaled!*/)
+@@ -130,7 +127,6 @@
  {
-     //return wxBitmap(img, -1 /*depth*/, static_cast<double>(getDPI()) / defaultDpi); implementation just ignores scale parameter! WTF!
+     //wxBitmap(const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0) => wxWidgets just ignores scale parameter! WTF!
      wxBitmap bmpScaled(img);
 -    bmpScaled.SetScaleFactor(getDisplayScaleFactor());
-     return bmpScaled;
+     return bmpScaled; //when testing use 175% scaling: wxWidgets' scaling logic doesn't kick in for 150% only
  }
  
 diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/graph.h 11.1-2/wx+/graph.h
diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series
index 467d69a..206af1e 100644
--- a/freefilesync/debian/patches/series
+++ b/freefilesync/debian/patches/series
@@ -5,7 +5,7 @@ ffs_no_check_updates.patch
 ffs_no_wx311.patch
 ffs_sftp.patch
 ffs_libssh2.patch
-ffs_curl.patch
+#ffs_curl.patch
 revert_zenju_aggressive_upstreamisms.patch
 ffs_gcc.patch
 ffs_traditional_view.patch