From owner-svn-ports-all@freebsd.org Mon May 20 12:52:43 2019 Return-Path: Delivered-To: svn-ports-all@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 8E88915AC8C8; Mon, 20 May 2019 12:52:43 +0000 (UTC) (envelope-from adridg@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 3011874F65; Mon, 20 May 2019 12:52:43 +0000 (UTC) (envelope-from adridg@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 E59FC1E8D5; Mon, 20 May 2019 12:52:42 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4KCqgwG006294; Mon, 20 May 2019 12:52:42 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4KCqgpw006293; Mon, 20 May 2019 12:52:42 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201905201252.x4KCqgpw006293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 20 May 2019 12:52:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502101 - in head/devel/kf5-kcoreaddons: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/devel/kf5-kcoreaddons: . files X-SVN-Commit-Revision: 502101 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3011874F65 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.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2019 12:52:43 -0000 Author: adridg Date: Mon May 20 12:52:42 2019 New Revision: 502101 URL: https://svnweb.freebsd.org/changeset/ports/502101 Log: Make KOSRelease class find our os-release - After much hemming and hawing we ended up with /usr/local/etc/os-release, which isn't one of the standard paths (according to freedesktop.org) so in spite of us **having** it, not all software that looks for it will find it. Patch in the correct path. Added: head/devel/kf5-kcoreaddons/files/ head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp (contents, props changed) Modified: head/devel/kf5-kcoreaddons/Makefile Modified: head/devel/kf5-kcoreaddons/Makefile ============================================================================== --- head/devel/kf5-kcoreaddons/Makefile Mon May 20 10:48:12 2019 (r502100) +++ head/devel/kf5-kcoreaddons/Makefile Mon May 20 12:52:42 2019 (r502101) @@ -2,6 +2,7 @@ PORTNAME= kcoreaddons DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org Added: head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp Mon May 20 12:52:42 2019 (r502101) @@ -0,0 +1,27 @@ +--- src/lib/util/kosrelease.cpp.orig 2019-05-08 08:27:20 UTC ++++ src/lib/util/kosrelease.cpp +@@ -76,13 +76,18 @@ static QStringList splitEntry(const QString &line) + + static QString defaultFilePath() + { +- if (QFile::exists(QStringLiteral("/etc/os-release"))) { +- return QStringLiteral("/etc/os-release"); +- } else if (QFile::exists(QStringLiteral("/usr/lib/os-release"))) { +- return QStringLiteral("/usr/lib/os-release"); +- } else { +- return QString(); ++ for (const auto& path : { ++#ifdef Q_OS_FREEBSD ++ QStringLiteral("/usr/local/etc/os-release"), ++#endif ++ QStringLiteral("/etc/os-release"), ++ QStringLiteral("/usr/lib/os-release") ++ }) { ++ if (QFile::exists(path)) { ++ return path; ++ } + } ++ return QString(); + } + + class Q_DECL_HIDDEN KOSRelease::Private