ffs 11.25 rpm rc1

3 files changed, 36 insertions, 46 deletions

diff --git a/freefilesync/01_no_check_updates.patch b/freefilesync/01_no_check_updates.patch
index c3e5d55..956b476 100644
--- a/freefilesync/01_no_check_updates.patch
+++ b/freefilesync/01_no_check_updates.patch
@@ -1,5 +1,5 @@
-Version: 11.23
-Date: 2022-08-03
+Version: 11.25
+Date: 2022-09-07
 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,15 +20,15 @@ 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 );
  
-@@ -1131,8 +1122,6 @@ MainDialogGenerated::MainDialogGenerated
+@@ -1132,8 +1123,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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
+     m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
 --- a/FreeFileSync/Source/ui/gui_generated.h
 +++ b/FreeFileSync/Source/ui/gui_generated.h
 @@ -96,8 +96,6 @@ protected:
@@ -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(); }
---- a/FreeFileSync/Source/ui/version_check.cpp
-+++ b/FreeFileSync/Source/ui/version_check.cpp
-@@ -73,6 +73,8 @@ time_t getVersionCheckCurrentTime()
+--- 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 @@
  
  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;
  
-@@ -151,8 +153,7 @@ void showUpdateAvailableDialog(wxWindow*
+@@ -168,8 +170,7 @@
      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(); }
  
-@@ -175,8 +176,8 @@ void showUpdateAvailableDialog(wxWindow*
+@@ -191,8 +192,8 @@
  
  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; }) ||
-@@ -223,58 +224,6 @@ void fff::disableUpdateCheck(time_t& las
+@@ -239,58 +240,6 @@
  }
  
  
@@ -233,7 +233,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -                                           setDetailInstructions(e.toString()), _("&Check"), _("&Retry")))
 -            {
 -                case ConfirmationButton2::accept:
--                    wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php");
+-                    openBrowserForDownload(&parent);
 -                    break;
 -                case ConfirmationButton2::accept2: //retry
 -                    checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!!
diff --git a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch
index 8231585..afa3b72 100644
--- a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/04_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-08-03
-Version: 11.23
+Date: 2022-09-07
+Version: 11.25
 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
@@ -260,10 +260,9 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/toggle_button.h 11.1-2/wx+/toggle_bu
 Version: 11.1
 Message: Had to revert gui_status_handler.cpp and .h entirely to version 11.0 to avoid the wx 3.1.4-isms here.
 diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp
-index 3cb6aaaa..9484af2c 100644
---- a/FreeFileSync/Source/ui/gui_status_handler.cpp
-+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp
-@@ -43,8 +43,8 @@ StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg,
+--- 11.25-0/FreeFileSync/Source/ui/gui_status_handler.cpp	2022-09-07 14:54:31.552630085 -0400
++++ 11.25-1/FreeFileSync/Source/ui/gui_status_handler.cpp	2022-09-07 16:32:17.114749584 -0400
+@@ -44,8 +44,8 @@
      mainDlg_.Update(); //don't wait until idle event!
  
      //register keys
@@ -274,7 +273,7 @@ index 3cb6aaaa..9484af2c 100644
  }
  
  
-@@ -128,9 +128,8 @@ StatusHandlerTemporaryPanel::~StatusHandlerTemporaryPanel()
+@@ -129,9 +129,8 @@
      mainDlg_.auiMgr_.Update();
  
      //unregister keys
@@ -286,7 +285,7 @@ index 3cb6aaaa..9484af2c 100644
  
      mainDlg_.compareStatus_->teardown();
  
-@@ -314,20 +313,20 @@ void StatusHandlerTemporaryPanel::forceUiUpdateNoThrow()
+@@ -324,7 +323,7 @@
  }
  
  
@@ -295,13 +294,7 @@ index 3cb6aaaa..9484af2c 100644
  {
      const int keyCode = event.GetKeyCode();
      if (keyCode == WXK_ESCAPE)
-     {
-         wxCommandEvent dummy;
--        onAbortCompare(dummy);
-+        OnAbortCompare(dummy);
-     }
- 
-     event.Skip();
+@@ -334,7 +333,7 @@
  }
  
  
@@ -352,18 +345,17 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+
          return bmpSquare;
      };
      pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim()));
---- 11.22-0/wx+/rtl.h	2022-06-26 12:01:15.642291514 -0400
-+++ 11.22-1/wx+/rtl.h	2022-06-26 12:58:17.248838575 -0400
-@@ -69,9 +69,6 @@
-             if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly!
-                 buffer.emplace(rect.GetSize());
- 
--            if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here?
--                buffer->SetScaleFactor(dc.GetContentScaleFactor());     //
--
-             wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap
-             memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction!
+--- 11.25-0/wx+/rtl.h	2022-09-07 14:54:31.712631887 -0400
++++ 11.25-1/wx+/rtl.h	2022-09-07 15:57:01.638891035 -0400
+@@ -70,8 +70,6 @@
+                 if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly!
+                     buffer.emplace(rect.GetSize());
+ 
+-                if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here?
+-                    buffer->SetScaleFactor(dc.GetContentScaleFactor());     //
  
+                 wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap
+                 memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction!
 --- 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp	2022-06-26 12:01:15.634291415 -0400
 +++ 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp	2022-06-26 14:44:38.556188935 -0400
 @@ -3595,7 +3590,6 @@
diff --git a/freefilesync/ffs_distro_fedora.patch b/freefilesync/ffs_distro_fedora.patch
index 2694274..78502ab 100644
--- a/freefilesync/ffs_distro_fedora.patch
+++ b/freefilesync/ffs_distro_fedora.patch
@@ -19,11 +19,10 @@ diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source
 diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile
 --- 11.25-0/FreeFileSync/Source/Makefile	2022-09-07 14:54:31.444628869 -0400
 +++ 11.25-1/FreeFileSync/Source/Makefile	2022-09-07 16:33:08.295327455 -0400
-@@ -1,11 +1,12 @@
+@@ -1,11 +1,11 @@
  CXX ?= g++
 -exeName = FreeFileSync_$(shell arch)
 +exeName = FreeFileSync
-+CXX=g++-12
  
  CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
             -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
@@ -34,7 +33,7 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefil
  
  
  CXXFLAGS  += `pkg-config --cflags openssl`
-@@ -17,9 +18,17 @@
+@@ -17,9 +18,10 @@
  CXXFLAGS  += `pkg-config --cflags libssh2`
  LDFLAGS += `pkg-config --libs   libssh2`
  
@@ -47,14 +46,13 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefil
  
  #support for SELinux (optional)
  SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
-diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile
+diff -Naur 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile
 --- 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile	2022-09-07 14:54:31.524629769 -0400
-+++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile	2022-09-07 16:33:08.299327501 -0400
-@@ -1,16 +1,18 @@
++++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile	2022-09-07 19:33:38.512766244 -0400
+@@ -1,16 +1,17 @@
  CXX ?= g++
 -exeName = RealTimeSync_$(shell arch)
 +exeName = RealTimeSync
-+CXX=g++-12
  
  CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
             -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
@@ -66,7 +64,7 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTim
  #Gtk - support "no button border"
 -CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
 +CXXFLAGS  += `pkg-config --cflags gtk+-3.0`
-+LDFLAGS += `pkg-config --libs   gtk+-3.0`
++LDFLAGS   += `pkg-config --libs   gtk+-3.0`
  #treat as system headers so that warnings are hidden:
 -CXXFLAGS  += -isystem/usr/include/gtk-2.0
 +CXXFLAGS  += -isystem/usr/include/gtk-3.0