diff options
author | B Stack <bgstack15@gmail.com> | 2019-11-28 13:50:21 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2019-11-28 13:50:21 +0000 |
commit | c7fdc62efaccb4248e73ac21e0312b13daffb084 (patch) | |
tree | 3a901681d4d445f05de6ffe27544b4680c6a8d2b /freefilesync/debian/patches/ffs_no_check_updates.patch | |
parent | Merge branch 'veracrypt-dpkg' into 'master' (diff) | |
parent | ffs_el7: -std=c++17 (diff) | |
download | stackrpms-c7fdc62efaccb4248e73ac21e0312b13daffb084.tar.gz stackrpms-c7fdc62efaccb4248e73ac21e0312b13daffb084.tar.bz2 stackrpms-c7fdc62efaccb4248e73ac21e0312b13daffb084.zip |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.18
See merge request bgstack15/stackrpms!101
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_check_updates.patch')
-rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index 4e56d19..eaff5c4 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -37,7 +37,7 @@ 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 -+++ 10.14-1/FreeFileSync/Source/ui/version_check.cpp 2019-07-16 11:45:36.113848111 -0400 ++++ 10.18-1/FreeFileSync/Source/ui/version_check.cpp 2019-11-20 09:19:50.936975067 -0500 @@ -69,6 +69,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -57,8 +57,8 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 updateDetailsMsg = utfTo<std::wstring>(buf); } catch (const zen::SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); } -@@ -187,8 +188,7 @@ - //access is thread-safe on Windows (WinInet), but not on Linux/OS X (wxWidgets) +@@ -182,8 +183,7 @@ + std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { - const std::string buffer = sendHttpPost(Zstr("https://api.freefilesync.org/latest_version"), postParams, |