git: 6da058ddded0 - main - devel/kf5-kio: fix compilation against ACL on recent current

From: Tobias C. Berner <tcberner_at_FreeBSD.org>
Date: Sun, 17 Oct 2021 16:52:17 UTC
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6da058ddded0b1035a452515c671055b2f8cbaf4

commit 6da058ddded0b1035a452515c671055b2f8cbaf4
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2021-10-17 12:44:20 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
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 <acl/libacl.h>
              ^~~~~~~~~~~~~~
    
    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 <KIO/UDSEntry>
++#if HAVE_POSIX_ACL
++#include "acl_portability.h"
++#endif
+ 
+-#include <acl/libacl.h>
+-#include <sys/acl.h>
+-
+ 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;
+             }