Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Apr 2019 17:17:26 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r498300 - head/net-im/psi/files
Message-ID:  <201904071717.x37HHQNK059935@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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();
+ 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904071717.x37HHQNK059935>