[SCM] kio packaging branch, master, updated. debian/5.11.0-1-5-gba088f5
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 7 11:25:10 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=c3f0a82
The following commit has been merged in the master branch:
commit c3f0a8263122c1e4a034657a15608e32a111d6c4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jul 7 10:59:26 2015 +0200
New patch: fix_freebsd_build.
---
debian/changelog | 1 +
debian/patches/fix_kfreebsd_build | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 4ff88cb..f345be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kio (5.11.0-2~) UNRELEASED; urgency=medium
* Refresh patch.
+ * New patch: fix_freebsd_build.
-- Maximiliano Curia <maxy at debian.org> Tue, 07 Jul 2015 10:58:07 +0200
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
new file mode 100644
index 0000000..d710204
--- /dev/null
+++ b/debian/patches/fix_kfreebsd_build
@@ -0,0 +1,24 @@
+Index: kio/src/widgets/kpropertiesdialog.cpp
+===================================================================
+--- kio.orig/src/widgets/kpropertiesdialog.cpp 2015-06-29 00:13:31.825361483 +0200
++++ kio/src/widgets/kpropertiesdialog.cpp 2015-07-07 10:56:53.101498107 +0200
+@@ -75,6 +75,10 @@
+ #if HAVE_POSIX_ACL
+ extern "C" {
+ # include <sys/xattr.h>
++# if defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
++# include <sys/vfs.h>
++# include <sys/mount.h>
++# endif
+ }
+ #endif
+
+@@ -1915,7 +1919,7 @@
+ static bool fileSystemSupportsACL(const QByteArray &path)
+ {
+ bool fileSystemSupportsACLs = false;
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(__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 c20b47a..a8d2efa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ return_on_ACCESS_DENIED
report_error_removing_dirs
wait_for_a_bit_longer
kubuntu_kdelibs4-docs-path.diff
+fix_kfreebsd_build
--
kio packaging
More information about the pkg-kde-commits
mailing list