From nobody Sun Oct 17 16:52:17 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 97E77180F7DD; Sun, 17 Oct 2021 16:52:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HXQz53dfwz3pBY; Sun, 17 Oct 2021 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CB7810B6B; Sun, 17 Oct 2021 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19HGqHTi060958; Sun, 17 Oct 2021 16:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19HGqHs4060957; Sun, 17 Oct 2021 16:52:17 GMT (envelope-from git) Date: Sun, 17 Oct 2021 16:52:17 GMT Message-Id: <202110171652.19HGqHs4060957@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 6da058ddded0 - main - devel/kf5-kio: fix compilation against ACL on recent current List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6da058ddded0b1035a452515c671055b2f8cbaf4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6da058ddded0b1035a452515c671055b2f8cbaf4 commit 6da058ddded0b1035a452515c671055b2f8cbaf4 Author: Tobias C. Berner AuthorDate: 2021-10-17 12:44:20 +0000 Commit: Tobias C. Berner CommitDate: 2021-10-17 16:49:53 +0000 devel/kf5-kio: fix compilation against ACL on recent current The update of KDE Frameworks to 5.87 [1] broke compilation of devel/kf5-kio on recent current: /usr/ports/devel/kf5-kio/work/kio-5.87.0/src/core/../aclhelpers_p.h:18:10: fatal error: 'acl/libacl.h' file not found #include ^~~~~~~~~~~~~~ Switch to using the compatiblity shim acl_portability.h. [1] c1f36e0f27920678c4d9d1f80d5b02f8c8f40c38 PR: 259032 Reported by: rhurlin --- devel/kf5-kio/files/patch-src_aclhelpers__p.h | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/devel/kf5-kio/files/patch-src_aclhelpers__p.h b/devel/kf5-kio/files/patch-src_aclhelpers__p.h new file mode 100644 index 000000000000..d666ee2c6dd1 --- /dev/null +++ b/devel/kf5-kio/files/patch-src_aclhelpers__p.h @@ -0,0 +1,34 @@ +--- src/aclhelpers_p.h.orig 2021-10-02 14:28:47 UTC ++++ src/aclhelpers_p.h +@@ -14,10 +14,10 @@ + *************************************/ + + #include ++#if HAVE_POSIX_ACL ++#include "acl_portability.h" ++#endif + +-#include +-#include +- + static QString aclToText(acl_t acl) + { + ssize_t size = 0; +@@ -33,7 +33,7 @@ static QString aclToText(acl_t acl) + static void appendACLAtoms(const QByteArray &path, KIO::UDSEntry &entry, mode_t type) + { + // first check for a noop +- if (acl_extended_file(path.data()) == 0) { ++ if (KIO::ACLPortability::acl_extended_file(path.data()) == 0) { + return; + } + +@@ -46,7 +46,7 @@ static void appendACLAtoms(const QByteArray &path, KIO + * ACL separately. Since a directory can have both, we need to check again. */ + if (isDir) { + if (acl) { +- if (acl_equiv_mode(acl, nullptr) == 0) { ++ if (KIO::ACLPortability::acl_equiv_mode(acl, nullptr) == 0) { + acl_free(acl); + acl = nullptr; + }