Merge branch 'freefilesync-bump' into 'master'

Freefilesync 11.13

See merge request bgstack15/stackrpms!256

11 files changed, 138 insertions, 104 deletions

diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index cbb681c..377f3c7 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,16 @@
+freefilesync (11.13-1+devuan) obs; urgency=medium
+
+  * Upstream updates
+    - Manage default filter settings via GUI
+    - Support arbitrary location for local app installation (macOS)
+    - Fixed ERROR_FILE_NOT_FOUND masking real file access error (Windows)
+    - Copy full file paths to clipboard (CTRL + C)
+    - Preserve clipboard contents until after program exit
+    - Always enable external command if independent of file items
+    - Support installation without Rosetta2 on ARM64 (macOS)
+
+ -- B. Stack <bgstack15@gmail.com>  Tu, 17 Aug 2021 19:25:55 -0400
+
 freefilesync (11.12-1+devuan) obs; urgency=medium
 
   * Upstream updates
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index 920d35c..75054f6 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: freefilesync
 Binary: freefilesync
 Architecture: any
-Version: 11.12-1+devuan
+Version: 11.13-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index 90bd831..473ae46 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -1,5 +1,5 @@
-Last version tested: 11.9
-This is still experimental.
+Last version tested: 11.13
+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
@@ -44,15 +44,14 @@ 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.4-0/FreeFileSync/Source/ui/sync_cfg.cpp	2020-12-08 08:15:29.432156507 -0500
-+++ 11.4-1/FreeFileSync/Source/ui/sync_cfg.cpp	2020-12-08 18:31:29.079355828 -0500
-@@ -333,7 +333,7 @@
+--- 11.13-0/FreeFileSync/Source/ui/sync_cfg.cpp	2021-08-17 19:18:02.039992429 -0400
++++ 11.13-1/FreeFileSync/Source/ui/sync_cfg.cpp	2021-08-17 19:33:01.693071327 -0400
+@@ -348,7 +348,7 @@
  commandHistoryOut_(commandHistory),
  globalPairCfg_(globalPairCfg),
- localPairCfg_(localPairConfig),
+ localPairCfg_(localPairCfg),
 -    enableExtraFeatures_(false),
 +    enableExtraFeatures_(true),
  showMultipleCfgs_(showMultipleCfgs)
  {
      setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
-
diff --git a/freefilesync/debian/patches/ffs_curl.patch b/freefilesync/debian/patches/ffs_curl.patch
index 0520d3a..2dd5974 100644
--- a/freefilesync/debian/patches/ffs_curl.patch
+++ b/freefilesync/debian/patches/ffs_curl.patch
@@ -1,10 +1,11 @@
 Author: Brulhart, bgstack15
 Date: 2021-06-12 10:54:15 -0400
 Message: remove assertion for libcurl version >1.71
-Version: FreeFileSync 11.11
+Version: FreeFileSync 11.13
 Message: We have to omit checking for certain definitions.
 On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96
 On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97
+For Devuan Ceres libcurl4-openssl-dev 7.74.0-1.3+b1 uses CURLE_TELNET_OPTION_SYNTAX and not CURLE_SETOPT_OPTION_SYNTAX which replaced the first at version 7.78.0 per https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions
 diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp
 --- 10.21-0/FreeFileSync/Source/afs/ftp.cpp  2020-03-18 08:56:08.608066350 -0400
 +++ 10.21-1/FreeFileSync/Source/afs/ftp.cpp  2020-03-18 09:23:46.882110499 -0400
@@ -20,6 +21,15 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
 diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h
 --- 11.11-0/libcurl/curl_wrap.h	2021-06-12 10:44:25.062468759 -0400
 +++ 11.11-1/libcurl/curl_wrap.h	2021-06-12 10:50:24.350613680 -0400
+@@ -89,7 +89,7 @@
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SETOPT_OPTION_SYNTAX);
++            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
 @@ -137,11 +137,8 @@
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 5e61dce..6524a1b 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,58 +1,58 @@
-Version: 11.10
+Version: 11.13
 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.12-1/FreeFileSync/Source/ui/gui_generated.cpp
---- 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-05-10 08:10:14.747776591 -0400
-+++ 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-07-15 10:41:28.446374196 -0400
+--- 11.13-0/FreeFileSync/Source/ui/gui_generated.cpp	2021-08-17 19:18:02.043992470 -0400
++++ 11.13-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-08-17 19:29:06.794700840 -0400
 @@ -108,17 +108,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_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();
+-    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 );
  
-@@ -1139,8 +1128,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 );
+@@ -1133,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 );
 diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h
---- 11.12-0/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 09:40:40.888701315 -0400
-+++ 11.12-1/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 10:11:03.761175152 -0400
+--- 11.13-0/FreeFileSync/Source/ui/gui_generated.h	2021-08-17 19:18:02.063992671 -0400
++++ 11.13-1/FreeFileSync/Source/ui/gui_generated.h	2021-08-17 19:29:21.978854111 -0400
 @@ -93,8 +93,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;
 @@ -229,8 +227,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.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
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch
index c48536f..b9b35cc 100644
--- a/freefilesync/debian/patches/ffs_traditional_view.patch
+++ b/freefilesync/debian/patches/ffs_traditional_view.patch
@@ -177,7 +177,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
                          {
                              wxRect rectGroupNameBack = rectGroupName;
  
-                             if (!itemName.empty()) 
+                             if (!itemName.empty())
                                  rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
 -                            rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
 +                            rectGroupNameBack.height -= lineWidth; //harmonize with item separation lines
@@ -215,7 +215,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 -                        rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
 +                        rectItemsBack.height -= lineWidth; //preserve item separation lines!
  
-                             drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
+                         drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
  
 @@ -1134,7 +1202,12 @@
                               groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
diff --git a/freefilesync/ffs_allow_parallel_ops.patch b/freefilesync/ffs_allow_parallel_ops.patch
index 90bd831..473ae46 100644
--- a/freefilesync/ffs_allow_parallel_ops.patch
+++ b/freefilesync/ffs_allow_parallel_ops.patch
@@ -1,5 +1,5 @@
-Last version tested: 11.9
-This is still experimental.
+Last version tested: 11.13
+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
@@ -44,15 +44,14 @@ 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.4-0/FreeFileSync/Source/ui/sync_cfg.cpp	2020-12-08 08:15:29.432156507 -0500
-+++ 11.4-1/FreeFileSync/Source/ui/sync_cfg.cpp	2020-12-08 18:31:29.079355828 -0500
-@@ -333,7 +333,7 @@
+--- 11.13-0/FreeFileSync/Source/ui/sync_cfg.cpp	2021-08-17 19:18:02.039992429 -0400
++++ 11.13-1/FreeFileSync/Source/ui/sync_cfg.cpp	2021-08-17 19:33:01.693071327 -0400
+@@ -348,7 +348,7 @@
  commandHistoryOut_(commandHistory),
  globalPairCfg_(globalPairCfg),
- localPairCfg_(localPairConfig),
+ localPairCfg_(localPairCfg),
 -    enableExtraFeatures_(false),
 +    enableExtraFeatures_(true),
  showMultipleCfgs_(showMultipleCfgs)
  {
      setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
-
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch
index 0520d3a..2dd5974 100644
--- a/freefilesync/ffs_curl.patch
+++ b/freefilesync/ffs_curl.patch
@@ -1,10 +1,11 @@
 Author: Brulhart, bgstack15
 Date: 2021-06-12 10:54:15 -0400
 Message: remove assertion for libcurl version >1.71
-Version: FreeFileSync 11.11
+Version: FreeFileSync 11.13
 Message: We have to omit checking for certain definitions.
 On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96
 On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97
+For Devuan Ceres libcurl4-openssl-dev 7.74.0-1.3+b1 uses CURLE_TELNET_OPTION_SYNTAX and not CURLE_SETOPT_OPTION_SYNTAX which replaced the first at version 7.78.0 per https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions
 diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp
 --- 10.21-0/FreeFileSync/Source/afs/ftp.cpp  2020-03-18 08:56:08.608066350 -0400
 +++ 10.21-1/FreeFileSync/Source/afs/ftp.cpp  2020-03-18 09:23:46.882110499 -0400
@@ -20,6 +21,15 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
 diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h
 --- 11.11-0/libcurl/curl_wrap.h	2021-06-12 10:44:25.062468759 -0400
 +++ 11.11-1/libcurl/curl_wrap.h	2021-06-12 10:50:24.350613680 -0400
+@@ -89,7 +89,7 @@
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SETOPT_OPTION_SYNTAX);
++            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
 @@ -137,11 +137,8 @@
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index 5e61dce..6524a1b 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/ffs_no_check_updates.patch
@@ -1,58 +1,58 @@
-Version: 11.10
+Version: 11.13
 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.12-1/FreeFileSync/Source/ui/gui_generated.cpp
---- 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-05-10 08:10:14.747776591 -0400
-+++ 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-07-15 10:41:28.446374196 -0400
+--- 11.13-0/FreeFileSync/Source/ui/gui_generated.cpp	2021-08-17 19:18:02.043992470 -0400
++++ 11.13-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-08-17 19:29:06.794700840 -0400
 @@ -108,17 +108,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_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();
+-    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 );
  
-@@ -1139,8 +1128,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 );
+@@ -1133,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 );
 diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h
---- 11.12-0/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 09:40:40.888701315 -0400
-+++ 11.12-1/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 10:11:03.761175152 -0400
+--- 11.13-0/FreeFileSync/Source/ui/gui_generated.h	2021-08-17 19:18:02.063992671 -0400
++++ 11.13-1/FreeFileSync/Source/ui/gui_generated.h	2021-08-17 19:29:21.978854111 -0400
 @@ -93,8 +93,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;
 @@ -229,8 +227,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.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
diff --git a/freefilesync/ffs_traditional_view.patch b/freefilesync/ffs_traditional_view.patch
index c48536f..b9b35cc 100644
--- a/freefilesync/ffs_traditional_view.patch
+++ b/freefilesync/ffs_traditional_view.patch
@@ -177,7 +177,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
                          {
                              wxRect rectGroupNameBack = rectGroupName;
  
-                             if (!itemName.empty()) 
+                             if (!itemName.empty())
                                  rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
 -                            rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
 +                            rectGroupNameBack.height -= lineWidth; //harmonize with item separation lines
@@ -215,7 +215,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 -                        rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
 +                        rectItemsBack.height -= lineWidth; //preserve item separation lines!
  
-                             drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
+                         drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
  
 @@ -1134,7 +1202,12 @@
                               groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index b77eb1f..bd9d7bf 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -19,7 +19,7 @@
 %define libssh2_name libssh2-%{name}
 %endif
 Name:       freefilesync
-Version:    11.12
+Version:    11.13
 Release:    1%{?dist}
 Summary:    A file synchronization utility
 
@@ -210,6 +210,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
 
 %changelog
+* Tue Aug 17 2021 B. Stack <bgstack15@gmail.com> - 11.13-1
+- version bump
+
 * Thu Jul 15 2021 B. Stack <bgstack15@gmail.com> - 11.12-1
 - version bump