summaryrefslogtreecommitdiff
path: root/sysutils/freefilesync/files/patch-ui_version__check.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/freefilesync/files/patch-ui_version__check.cpp')
-rw-r--r--sysutils/freefilesync/files/patch-ui_version__check.cpp22
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));
+