From owner-svn-ports-head@freebsd.org Sun Apr 7 17:17:26 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB3E0156567A; Sun, 7 Apr 2019 17:17:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CA1C69F82; Sun, 7 Apr 2019 17:17:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D06EF363; Sun, 7 Apr 2019 17:17:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37HHQwt059936; Sun, 7 Apr 2019 17:17:26 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37HHQNK059935; Sun, 7 Apr 2019 17:17:26 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201904071717.x37HHQNK059935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 7 Apr 2019 17:17:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498300 - head/net-im/psi/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/net-im/psi/files X-SVN-Commit-Revision: 498300 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7CA1C69F82 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 17:17:27 -0000 Author: danfe Date: Sun Apr 7 17:17:25 2019 New Revision: 498300 URL: https://svnweb.freebsd.org/changeset/ports/498300 Log: Report correct FreeBSD version: currently, QSysInfo::productVersion() on FreeBSD bogusly returns "unknown". PR: 237075 Added: head/net-im/psi/files/patch-src_systeminfo.cpp (contents, props changed) Added: head/net-im/psi/files/patch-src_systeminfo.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/psi/files/patch-src_systeminfo.cpp Sun Apr 7 17:17:25 2019 (r498300) @@ -0,0 +1,19 @@ +--- src/systeminfo.cpp.orig 2018-11-02 00:15:39 UTC ++++ src/systeminfo.cpp +@@ -191,6 +191,16 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::i + } + #endif + ++#ifdef __FreeBSD__ ++ // QSysInfo::productVersion() on FreeBSD currently does not return ++ // correct OS version (see PR 237075) ++ if (os_version_str_ == "unknown") { ++ struct utsname u; ++ uname(&u); ++ os_version_str_ = u.release; ++ } ++#endif ++ + if (!os_version_str_.isEmpty() && os_name_str_.contains(os_version_str_)) { + os_version_str_.clear(); + }