diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-03-02 08:51:18 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-03-02 08:51:18 +0000 |
| commit | 19f1bc0500992601b9fe701ab1e8d3f72d598d89 (patch) | |
| tree | 45943a1445dfa721dba7c94aa3b51e773ff7a2e4 /sysutils/freefilesync/files/patch-ui_version__check.cpp | |
| parent | - Make libmicrohttpd support optional but on by default (diff) | |
sysutils/freefilesync: Update to 9.8
Port changes:
* Updated LICENSE_FILE
* Added IGNORE_FreeBSD_10 because of missing _cxa_thread_atexit()
* Added to LIB_DEPENDS
* Added USE_GNOME
* Removed USE_LDCONFIG
* Updated post-patch
PR: 226276
Submitted by: Olexandr Davydenko <odavydenko@gmail.com>
Approved by: tcberner (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=463383
Diffstat (limited to 'sysutils/freefilesync/files/patch-ui_version__check.cpp')
| -rw-r--r-- | sysutils/freefilesync/files/patch-ui_version__check.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sysutils/freefilesync/files/patch-ui_version__check.cpp b/sysutils/freefilesync/files/patch-ui_version__check.cpp index 86950ff30d5b..cc888fd4f909 100644 --- a/sysutils/freefilesync/files/patch-ui_version__check.cpp +++ b/sysutils/freefilesync/files/patch-ui_version__check.cpp @@ -1,22 +1,22 @@ ---- ui/version_check.cpp.orig 2016-06-30 13:33:44.614966000 +0800 -+++ ui/version_check.cpp 2016-06-30 13:36:17.540454000 +0800 -@@ -104,16 +104,10 @@ - const auto osvMinor = getOsVersion().minor; +--- ui/version_check.cpp.orig 2018-03-02 05:46:44 UTC ++++ ui/version_check.cpp +@@ -70,16 +70,10 @@ std::vector<std::pair<std::string, std:: + params.emplace_back("installation_type", isPortableVersion() ? "Portable" : "Local"); - #elif defined ZEN_LINUX -- params.emplace_back("os_name", "Linux"); -+ params.emplace_back("os_name", "FreeBSD"); +- params.emplace_back("os_name", "Linux"); +- - const wxLinuxDistributionInfo distribInfo = wxGetLinuxDistributionInfo(); - assert(contains(distribInfo.Release, L'.')); -- std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.'); //e.g. "15.04" +- std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.', SplitType::ALLOW_EMPTY); //e.g. "15.04" - digits.resize(2); - //distribInfo.Id //e.g. "Ubuntu" -- ++ params.emplace_back("os_name", "FreeBSD"); + - const int osvMajor = stringTo<int>(digits[0]); - const int osvMinor = stringTo<int>(digits[1]); + const int osvMajor = 0; + const int osvMinor = 0; - #elif defined ZEN_MAC - params.emplace_back("os_name", "Mac"); + params.emplace_back("os_version", numberTo<std::string>(osvMajor) + "." + numberTo<std::string>(osvMinor)); + |