ffs 11.2 rpm for fedora

1 files changed, 29 insertions, 31 deletions

diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index 62f4e7e..4616461 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/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 -aur 11.2-0/FreeFileSync/Source/ui/main_dlg.cpp 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp
+--- 11.2-0/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 14:39:05.333463811 -0400
++++ 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 14:52:01.515034696 -0400
+@@ -5621,7 +5621,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 @@
+@@ -5629,6 +5629,7 @@
          automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                   automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get());
      }
@@ -18,27 +18,26 @@ 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);
--
+@@ -5653,6 +5654,7 @@
+         }
+     };
+ 
 +    /*
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5567,6 +5568,7 @@
-                                      resultAsync.get()); //run on main thread:
-         });
+@@ -5669,6 +5671,7 @@
      }
-+    */
+     else
+         showNewVersionReminder();
++   */
  }
  
  
-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 -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/Source/ui/version_check.cpp
+--- 11.2-0/FreeFileSync/Source/ui/version_check.cpp	2020-10-02 14:39:05.297463367 -0400
++++ 11.2-1/FreeFileSync/Source/ui/version_check.cpp	2020-10-02 14:55:17.857457477 -0400
+@@ -70,6 +70,8 @@
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -47,17 +46,17 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -159,8 +161,7 @@
+@@ -156,8 +158,7 @@
+     std::wstring updateDetailsMsg;
+     try
      {
-         try
-         {
--            const std::string buf = sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })),
--            ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError
-+            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 @@
+-        updateDetailsMsg = utfTo<std::wstring>(sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })),
+-        ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError
++        updateDetailsMsg = utfTo<std::wstring>("");
+     }
+     catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); }
+ 
+@@ -178,8 +179,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 @@
+@@ -226,13 +226,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)
      {
-