diff options
| author | B Stack <bgstack15@gmail.com> | 2021-03-03 13:48:13 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-03-03 13:48:13 +0000 |
| commit | c2b81c1ef445010392304ce11a3a4f29e8c44976 (patch) | |
| tree | 1e39ccf0a22cb26aaa3e587bf656a2b037a3ae79 /freefilesync/debian/patches/ffs_no_check_updates.patch | |
| parent | Merge branch 'notepadpp-bump' into 'master' (diff) | |
| parent | ffs 11.7 rc1 (diff) | |
| download | stackrpms-c2b81c1ef445010392304ce11a3a4f29e8c44976.tar.gz stackrpms-c2b81c1ef445010392304ce11a3a4f29e8c44976.tar.bz2 stackrpms-c2b81c1ef445010392304ce11a3a4f29e8c44976.zip | |
Merge branch 'freefilesync-bump' into 'master'
ffs 11.7
See merge request bgstack15/stackrpms!224
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_check_updates.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index 2413cba..d90bf7d 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -34,10 +34,10 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/main + */ } - -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 + +diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/Source/ui/version_check.cpp +--- 11.7-0/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:21:26.820360086 -0500 ++++ 11.7-1/FreeFileSync/Source/ui/version_check.cpp 2021-03-02 17:49:29.535590111 -0500 @@ -70,6 +70,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -47,11 +47,11 @@ diff -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/So if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -156,8 +158,7 @@ +@@ -159,8 +161,7 @@ std::wstring updateDetailsMsg; try { -- updateDetailsMsg = utfTo<std::wstring>(sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })), +- 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>(""); } |