Date: Mon, 20 May 2019 16:53:31 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Adriaan de Groot <adridg@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r502101 - in head/devel/kf5-kcoreaddons: . files Message-ID: <20190520145331.GA72151@ThinkPad-X200.g.anongoth.pl> In-Reply-To: <201905201252.x4KCqgpw006293@repo.freebsd.org> References: <201905201252.x4KCqgpw006293@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--mGriXR2gKCLcP+sI Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This will break PREFIX other than /usr/local. On 19-05-20 12:52:42, Adriaan de Groot wrote: >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-rele= ase, which isn't one > of the standard paths (according to freedesktop.org) so in spite of u= s **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 (co= ntents, props changed) >Modified: > head/devel/kf5-kcoreaddons/Makefile > >Modified: head/devel/kf5-kcoreaddons/Makefile >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >--- 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=3D kcoreaddons > DISTVERSION=3D ${KDE_FRAMEWORKS_VERSION} >+PORTREVISION=3D 1 > CATEGORIES=3D devel kde kde-frameworks > > MAINTAINER=3D kde@FreeBSD.org > >Added: head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >--- /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 > > >--=20 >This message has been scanned for viruses and >dangerous content by MailScanner, and is >believed to be clean. > --mGriXR2gKCLcP+sI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEycyIeNkkgohzsoorelmbhSCDnJ0FAlziv2tfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM5 Q0M4ODc4RDkyNDgyODg3M0IyOEEyQjdBNTk5Qjg1MjA4MzlDOUQACgkQelmbhSCD nJ1oXBAAuy7k0HYJJtezOvzY/fQXOjP6+wvNIhYOgYcuEIvrmwf0Xh/97HeJI1VB RXRreeKzcyFtVuEuosxcVv7sAB8+e+HPlk+kz+mNZMWDMJ31hq0Z3w5U36NriZ9U onwxOTNg2gIbOOYAmUw4nHhLHAy6yKjqbz/epjpT30rpxPD3euHmK/hXuZu/t2cp LOWuYaYfFX36eaLqsnqbUXT8tzdp7AGR+R5oZO1hJtohNiG3t7yIGIO6xDdDgghx nSB4BQOZeyQM1N1CUBqq/ybpczaFmWKQnvs3nB4GwBJQ26XsR9FoY2B2RCyeVkNo g++sRQdg9k0+6lS1AOquIp773ESaEmlM/m8n+CNJKOXnbBKnRax4tp0MdT8ailhh X43QgHTzkUFulAMowXSCCeXioiLvvyJefH4c/FNM11pUe2+685o1MmRleUuQjKkp 0cszBJWyyVB0pSoOLGjlO1vTIeiHoJAFPCQ/sogZccYZCP9j5DqRlzGVy6dmheBS dVJ3AeUIhGjDH7Nt7jUrZCGwO/P8FkaYOPDb/64WUMQBgrgc+bsh0oE71TNzcAwN nVG0TtIZnntPd6Yp7BIUxYoWTomTGjXuiqo16ANDmMmlOPpQmdMOGWjXwtUxdUDw 0tMMAjvoa/kMvt9Q/zzhhzreLofNlP9QcDOLzt+VKgCK+ZpuZB8= =BgzG -----END PGP SIGNATURE----- --mGriXR2gKCLcP+sI--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190520145331.GA72151>