From 7cdadd67894949bd1ab4c0a5f261d4441d38a3af44f2010f47b304c3c46bd283 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Sun, 3 Mar 2019 13:35:55 +0000
Subject: [PATCH] Accepting request 681086 from home:wolfi323:test

- Add Fix-NTFS-hidden-check-for-symlinks.patch to avoid hiding
  symlinks to NTFS mountpoints (kde#402738)

OBS-URL: https://build.opensuse.org/request/show/681086
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=250
---
 Fix-NTFS-hidden-check-for-symlinks.patch | 32 ++++++++++++++++++++++++
 kio.changes                              |  6 +++++
 kio.spec                                 |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 Fix-NTFS-hidden-check-for-symlinks.patch

diff --git a/Fix-NTFS-hidden-check-for-symlinks.patch b/Fix-NTFS-hidden-check-for-symlinks.patch
new file mode 100644
index 0000000..8f3b54e
--- /dev/null
+++ b/Fix-NTFS-hidden-check-for-symlinks.patch
@@ -0,0 +1,32 @@
+From 01a7e0e757d3558e131d24fbb079b65af7b70572 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Sun, 3 Mar 2019 12:53:37 +0100
+Subject: Fix NTFS hidden check for symlinks to NTFS mountpoints
+
+A symlink to the mountpoint of an NTFS partition can have the type
+DT_LNK.
+So extend the check to cover that case as well.
+
+BUG: 402738
+FIXED-IN: 5.57.0
+Differential Revision: https://phabricator.kde.org/D18479
+---
+ src/ioslaves/file/file_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 1816f11..5dca327 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -589,7 +589,7 @@ void FileProtocol::listDir(const QUrl &url)
+                     bool ntfsHidden = true;
+ 
+                     // Bug 392913: NTFS root volume is always "hidden", ignore this
+-                    if (ep->d_type == DT_DIR || ep->d_type == DT_UNKNOWN) {
++                    if (ep->d_type == DT_DIR || ep->d_type == DT_UNKNOWN || ep->d_type == DT_LNK) {
+                         const QString fullFilePath = QDir(filename).canonicalPath();
+                         auto mountPoint = KMountPoint::currentMountPoints().findByPath(fullFilePath);
+                         if (mountPoint && mountPoint->mountPoint() == fullFilePath) {
+-- 
+cgit v1.1
+
diff --git a/kio.changes b/kio.changes
index e55b1ab..f226c46 100644
--- a/kio.changes
+++ b/kio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Mar  3 11:59:08 UTC 2019 - wbauer@tmo.at
+
+- Add Fix-NTFS-hidden-check-for-symlinks.patch to avoid hiding
+  symlinks to NTFS mountpoints (kde#402738)
+
 -------------------------------------------------------------------
 Fri Feb 15 09:25:42 UTC 2019 - alarrosa@suse.com
 
diff --git a/kio.spec b/kio.spec
index e95d68b..3da31d5 100644
--- a/kio.spec
+++ b/kio.spec
@@ -33,6 +33,8 @@ Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
 Patch0:         kio_help-fallback-to-kde4-docs.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         Fix-NTFS-hidden-check-for-symlinks.patch
 BuildRequires:  cmake >= 3.0
 BuildRequires:  extra-cmake-modules >= %{_kf5_bugfix_version}
 BuildRequires:  fdupes