[SCM] KDE Development Platform Libraries module packaging branch, kde4.11, updated. debian/4.11.3-2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=9340214

The following commit has been merged in the kde4.11 branch:
commit 9340214eff359749f3b235cc0d7b921809e18038
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Nov 7 18:29:18 2013 +0100

    New patch kfreebsd_acl.diff, to fix build in kfreebsd-*.
---
 debian/changelog                 |    2 +-
 debian/patches/kfreebsd_acl.diff |   29 +++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 776239b..71dda96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 kde4libs (4:4.11.3-2) UNRELEASED; urgency=low
 
-  * 
+  * New patch kfreebsd_acl.diff, to fix build in kfreebsd-*.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 07 Nov 2013 18:27:11 +0100
 
diff --git a/debian/patches/kfreebsd_acl.diff b/debian/patches/kfreebsd_acl.diff
new file mode 100644
index 0000000..a990afe
--- /dev/null
+++ b/debian/patches/kfreebsd_acl.diff
@@ -0,0 +1,29 @@
+Index: kde4libs-4.11.3/kio/kfile/kpropertiesdialog.cpp
+===================================================================
+--- kde4libs-4.11.3.orig/kio/kfile/kpropertiesdialog.cpp	2013-11-07 08:55:21.000000000 +0000
++++ kde4libs-4.11.3/kio/kfile/kpropertiesdialog.cpp	2013-11-07 10:15:09.000000000 +0000
+@@ -53,6 +53,15 @@
+ #include <time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++
++// This is the *BSD branch
++#ifdef HAVE_SYS_MOUNT_H
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++#include <sys/mount.h>
++#endif
++
+ }
+ #include <unistd.h>
+ #include <errno.h>
+@@ -1896,7 +1905,7 @@
+ static bool fileSystemSupportsACL( const QByteArray& path )
+ {
+     bool fileSystemSupportsACLs = false;
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD)  || defined(Q_OS_FREEBSD_KERNEL)
+     struct statfs buf;
+     fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index ba888d4..c49a0f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 kfreebsd_getmntent.diff
+kfreebsd_acl.diff

-- 
KDE Development Platform Libraries module packaging