[SCM] kio packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu3-69-g8f1ca26

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=8f1ca26

The following commit has been merged in the kubuntu_unstable branch:
commit 8f1ca261a32c54f377a75cda482f5ae390673983
Author: Clive Johnston <clivejo at aol.com>
Date:   Sun Feb 7 12:00:38 2016 +0000

    Removing the fix_kfreebsd_build patch
---
 debian/patches/fix_kfreebsd_build | 24 ------------------------
 debian/patches/series             |  1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
deleted file mode 100644
index 0beb03b..0000000
--- a/debian/patches/fix_kfreebsd_build
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 0ff5062..217da11 100644
---- src/widgets/kpropertiesdialog.cpp
-+++ b/src/widgets/kpropertiesdialog.cpp
-@@ -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 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
- 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 05edfe8..1e4a97c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ return_on_ACCESS_DENIED
 report_error_removing_dirs
 wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
-#fix_kfreebsd_build

-- 
kio packaging