WIP: ffs 11.1

   Does not compile yet, but this was just fixing all the fuzz.

3 files changed, 23 insertions, 37 deletions

diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 16268d1..8a5e83e 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -1,8 +1,7 @@
 Author: B Stack
 Source: Original research
-Date: 2020-03-18
-Message: Main patch to compile on Devuan using GTK3. BROKEN for FreeFileSync 10.21!
-This reintroduces the gtk-3 usage, because Debian/Devuan stopped packaging libwxgtk3.0-dev (which used gtk2) and only does libwxgtk3.0-gtk3-dev. However, by reintroducing the gtk3, it brings back the old gtk3 instability from my previous packaging effort: https://freefilesync.org/forum/viewtopic.php?t=4918. /mnt/public/packages/old/freefilesync/freefilesync-9.7-1.master.tgz. Upstream never replied, but did note in the source that gtk3 is inherently unstable.
+Date: 2020-08-31
+Message: Main patch to compile on Devuan using GTK3.
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
 --- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
 +++ 10.18-1/FreeFileSync/Source/Makefile	2019-11-21 09:42:57.408243242 -0500
@@ -35,15 +34,3 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/RealTi
  
  cppFiles=
  cppFiles+=application.cpp
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1/wx+/dc.h
---- 10.18-0/wx+/dc.h	2019-11-21 08:24:23.967769384 -0500
-+++ 10.18-1/wx+/dc.h	2019-11-21 09:42:12.779786504 -0500
-@@ -54,7 +54,7 @@
- #ifdef wxHAVE_DPI_INDEPENDENT_PIXELS //pulled from wx/window.h: https://github.com/wxWidgets/wxWidgets/blob/master/include/wx/window.h#L2029
-     return d; //e.g. macOS, GTK3
- #else //https://github.com/wxWidgets/wxWidgets/blob/master/src/common/wincmn.cpp#L2865
--    static_assert(GTK_MAJOR_VERSION == 2);
-+    static_assert(GTK_MAJOR_VERSION == 3);
-     //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114
-     //=> requires general fix at wxWidgets-level
-     assert(wxTheApp); //only call after wxWidgets was initalized!
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 62f4e7e..fcbeb97 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,7 +1,7 @@
-diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp
---- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp	2019-02-10 22:01:42.029158919 -0500
-+++ 11.0-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-07-22 11:49:13.747407290 -0400
-@@ -5538,7 +5538,7 @@
+diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/main_dlg.cpp 11.1-1/FreeFileSync/Source/ui/main_dlg.cpp
+--- 11.1-0/FreeFileSync/Source/ui/main_dlg.cpp	2020-08-31 20:04:21.621863187 -0400
++++ 11.1-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-08-31 20:55:07.732089665 -0400
+@@ -5606,7 +5606,7 @@
          globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
  
      m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
@@ -10,7 +10,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5546,6 +5546,7 @@
+@@ -5614,6 +5614,7 @@
          automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                   automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get());
      }
@@ -18,16 +18,15 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-
  }
  
  
-@@ -5553,7 +5554,7 @@
- {
-     //execute just once per startup!
-     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
--
+@@ -5623,6 +5624,7 @@
+     [[maybe_unused]] bool ubOk = Unbind(wxEVT_IDLE, &MainDialog::onRegularUpdateCheck, this);
+     assert(ubOk);
+ 
 +    /*
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5567,6 +5568,7 @@
+@@ -5636,6 +5638,7 @@
                                       resultAsync.get()); //run on main thread:
          });
      }
@@ -35,10 +34,10 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-
  }
  
  
-diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 10.14-1/FreeFileSync/Source/ui/version_check.cpp
---- 10.9-0/FreeFileSync/Source/ui/version_check.cpp	2019-02-10 22:01:42.126160041 -0500
-+++ 11.0-1/FreeFileSync/Source/ui/version_check.cpp	2020-07-22 11:43:36.895201090 -0400
-@@ -69,6 +69,8 @@
+diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/version_check.cpp 11.1-1/FreeFileSync/Source/ui/version_check.cpp
+--- 11.1-0/FreeFileSync/Source/ui/version_check.cpp	2020-08-31 20:04:21.573862614 -0400
++++ 11.1-1/FreeFileSync/Source/ui/version_check.cpp	2020-08-31 20:48:08.102811585 -0400
+@@ -70,6 +70,8 @@
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -47,7 +46,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -159,8 +161,7 @@
+@@ -155,8 +157,7 @@
      {
          try
          {
@@ -56,8 +55,8 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
 +            const std::string buf = "";
              updateDetailsMsg = utfTo<std::wstring>(buf);
          }
-         catch (const zen::SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); }
-@@ -189,8 +190,7 @@
+         catch (const SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); }
+@@ -185,8 +186,7 @@
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -67,7 +66,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
      return trimCpy(response);
  }
  
-@@ -237,13 +237,13 @@
+@@ -233,13 +233,13 @@
          const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError
          lastOnlineVersion = onlineVersion;
  
@@ -83,6 +82,5 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
 -                                   setMainInstructions(_("FreeFileSync is up to date.")));
 +                                   setMainInstructions(_("Use your package manager for any updates to FreeFileSync.")));
      }
-     catch (const zen::SysError& e)
+     catch (const SysError& e)
      {
-
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index 8ca60c2..8510b4b 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -77,7 +77,7 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/
 -    const int selectedPos = ctrl.GetSelection();
 +    const Enum currentValue = getEnumVal(mapping, ctrl);
  
--    if (0 <= selectedPos && selectedPos < static_cast<int>(mapping.descrList.size()))
+-    if (0 <= selectedPos && selectedPos < std::ssize(mapping.descrList))
 -    {
 -        if (const auto& [text, tooltip] = mapping.descrList[selectedPos].second;
 -            !tooltip.empty())
@@ -92,3 +92,4 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/
  }
  }
  
+