From f411b2edb3819c8328be3885ad71fd9c863775be Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Thu, 14 Feb 2019 18:20:14 +0000
Subject: FreeFileSync 10.9 rpm and dpkg

---
 freefilesync/ffs_no_check_updates.patch | 56 +++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 23 deletions(-)

(limited to 'freefilesync/ffs_no_check_updates.patch')

diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index 99f0c8f..3582b1d 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/ffs_no_check_updates.patch
@@ -1,7 +1,7 @@
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.3-2/FreeFileSync/Source/ui/main_dlg.cpp
---- 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/ui/main_dlg.cpp	2018-08-08 18:50:50.455078387 -0400
-@@ -5004,7 +5004,7 @@
+diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp 10.9-1/FreeFileSync/Source/ui/main_dlg.cpp
+--- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp	2019-02-10 22:01:42.029158919 -0500
++++ 10.9-1/FreeFileSync/Source/ui/main_dlg.cpp	2019-02-10 22:01:57.435336536 -0500
+@@ -5023,7 +5023,7 @@
          globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
  
      m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
@@ -10,7 +10,7 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5012,6 +5012,7 @@
+@@ -5031,6 +5031,7 @@
          automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                   automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get());
      }
@@ -18,7 +18,7 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.
  }
  
  
-@@ -5019,7 +5020,7 @@
+@@ -5038,7 +5039,7 @@
  {
      //execute just once per startup!
      Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
@@ -27,7 +27,7 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5033,6 +5034,7 @@
+@@ -5052,6 +5053,7 @@
                                       resultAsync.get()); //run on main thread:
          });
      }
@@ -35,23 +35,33 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.
  }
  
  
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/version_check_impl.h 10.3-2/FreeFileSync/Source/ui/version_check_impl.h
---- 10.3-0/FreeFileSync/Source/ui/version_check_impl.h	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/ui/version_check_impl.h	2018-08-08 18:50:50.458078415 -0400
-@@ -14,7 +14,7 @@
+diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/version_check.cpp 10.9-1/FreeFileSync/Source/ui/version_check.cpp
+--- 10.9-0/FreeFileSync/Source/ui/version_check.cpp	2019-02-10 22:01:42.126160041 -0500
++++ 10.9-1/FreeFileSync/Source/ui/version_check.cpp	2019-02-10 22:17:56.183369507 -0500
+@@ -69,6 +69,8 @@
  
- namespace fff
+ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
--inline
-+
- time_t getVersionCheckInactiveId()
- {
-     //use current version to calculate a changing number for the inactive state near UTC begin, in order to always check for updates after installing a new version
-@@ -38,7 +38,6 @@
- }
++    // short-circuit
++    return false;
+     if (lastUpdateCheck == getVersionCheckInactiveId())
+         return false;
  
+@@ -236,13 +238,13 @@
+         const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError
+         lastOnlineVersion = onlineVersion;
  
--inline
- time_t getVersionCheckCurrentTime()
- {
-     return std::time(nullptr);
+-        if (haveNewerVersionOnline(onlineVersion))
+-            showUpdateAvailableDialog(parent, onlineVersion);
+-        else
++        //if (haveNewerVersionOnline(onlineVersion))
++        //    showUpdateAvailableDialog(parent, onlineVersion);
++        //else
+             showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg().
+                                    setIcon(getResourceImage(L"update_check")).
+                                    setTitle(_("Check for Program Updates")).
+-                                   setMainInstructions(_("FreeFileSync is up to date.")));
++                                   setMainInstructions(_("Use your package manager for any updates to FreeFileSync.")));
+     }
+     catch (const zen::SysError& e)
+     {
-- 
cgit