mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-27 10:03:20 +00:00
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] c1f36e0f27
PR: 259032
Reported by: rhurlin
This commit is contained in:
parent
e5b4334250
commit
6da058ddde
34
devel/kf5-kio/files/patch-src_aclhelpers__p.h
Normal file
34
devel/kf5-kio/files/patch-src_aclhelpers__p.h
Normal file
@ -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;
|
||||
}
|
Loading…
Reference in New Issue
Block a user