Accepting request 636006 from KDE:Frameworks5
KDE Frameworks 5.50 OBS-URL: https://build.opensuse.org/request/show/636006 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
701ca985d7
@ -1,96 +0,0 @@
|
||||
From 3640475b0a8ea4a2eca060ed0bcf1f8f8da22375 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||
Date: Fri, 4 May 2018 16:22:57 +0200
|
||||
Subject: [PATCH] Revert "Support NTFS hidden files"
|
||||
|
||||
This reverts commit d7cce9937d5e9af2753fadb82d11f308b58bb8fa.
|
||||
|
||||
The new support for NTFS hidden files causes the mountpoint itself
|
||||
to be hidden as well, apparently the root directory of an NTFS
|
||||
partition always has the "hidden" attribute set.
|
||||
|
||||
https://bugs.kde.org/show_bug.cgi?id=392913
|
||||
http://bugzilla.opensuse.org/show_bug.cgi?id=1091780
|
||||
---
|
||||
src/ioslaves/file/file_unix.cpp | 54 -----------------------------------------
|
||||
1 file changed, 54 deletions(-)
|
||||
|
||||
Index: kio-5.48.0git.20180707T215251~1fa87fdd/src/ioslaves/file/file_unix.cpp
|
||||
===================================================================
|
||||
--- kio-5.48.0git.20180707T215251~1fa87fdd.orig/src/ioslaves/file/file_unix.cpp
|
||||
+++ kio-5.48.0git.20180707T215251~1fa87fdd/src/ioslaves/file/file_unix.cpp
|
||||
@@ -38,9 +38,6 @@
|
||||
#include <kmountpoint.h>
|
||||
|
||||
#include <errno.h>
|
||||
-#if HAVE_SYS_XATTR_H
|
||||
-#include <sys/xattr.h>
|
||||
-#endif
|
||||
#include <utime.h>
|
||||
|
||||
#include <KAuth>
|
||||
@@ -416,52 +413,6 @@ static bool isLocalFileSameHost(const QU
|
||||
return (QString::compare(url.host(), QLatin1String(hostname), Qt::CaseInsensitive) == 0);
|
||||
}
|
||||
|
||||
-#if HAVE_SYS_XATTR_H
|
||||
-static bool isNtfsHidden(const QString &filename)
|
||||
-{
|
||||
- constexpr auto attrName = "system.ntfs_attrib_be";
|
||||
- const auto filenameEncoded = QFile::encodeName(filename);
|
||||
-#ifdef Q_OS_MACOS
|
||||
- auto length = getxattr(filenameEncoded.data(), attrName, nullptr, 0, 0, XATTR_NOFOLLOW);
|
||||
-#else
|
||||
- auto length = getxattr(filenameEncoded.data(), attrName, nullptr, 0);
|
||||
-#endif
|
||||
- if (length <= 0) {
|
||||
- return false;
|
||||
- }
|
||||
- constexpr size_t xattr_size = 1024;
|
||||
- char strAttr[xattr_size];
|
||||
-#ifdef Q_OS_MACOS
|
||||
- length = getxattr(filenameEncoded.data(), attrName, strAttr, xattr_size, 0, XATTR_NOFOLLOW);
|
||||
-#else
|
||||
- length = getxattr(filenameEncoded.data(), attrName, strAttr, xattr_size);
|
||||
-#endif
|
||||
- if (length <= 0) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- // Decode result to hex string
|
||||
- static constexpr auto digits = "0123456789abcdef";
|
||||
- QVarLengthArray<char> hexAttr(static_cast<int>(length) * 2 + 4);
|
||||
- char *c = strAttr;
|
||||
- char *e = hexAttr.data();
|
||||
- *e++ ='0';
|
||||
- *e++ = 'x';
|
||||
- for (auto n = 0; n < length; n++, c++) {
|
||||
- *e++ = digits[(static_cast<uchar>(*c) >> 4)];
|
||||
- *e++ = digits[(static_cast<uchar>(*c) & 0x0F)];
|
||||
- }
|
||||
- *e = '\0';
|
||||
-
|
||||
- // Decode hex string to int
|
||||
- auto intAttr = static_cast<uint>(strtol(hexAttr.data(), nullptr, 16));
|
||||
-
|
||||
- constexpr auto FILE_ATTRIBUTE_HIDDEN = 0x2u;
|
||||
- return static_cast<bool>(intAttr & FILE_ATTRIBUTE_HIDDEN);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
-
|
||||
void FileProtocol::listDir(const QUrl &url)
|
||||
{
|
||||
if (!isLocalFileSameHost(url)) {
|
||||
@@ -558,11 +509,6 @@ void FileProtocol::listDir(const QUrl &u
|
||||
|
||||
} else {
|
||||
if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) {
|
||||
-#if HAVE_SYS_XATTR_H
|
||||
- if (isNtfsHidden(filename)) {
|
||||
- entry.fastInsert(KIO::UDSEntry::UDS_HIDDEN, 1);
|
||||
- }
|
||||
-#endif
|
||||
listEntry(entry);
|
||||
}
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f3089c1746dcd86d100b57a011e6f6fcbdf0622bad6f546e63048815de783a67
|
||||
size 3164592
|
||||
3
kio-5.50.0.tar.xz
Normal file
3
kio-5.50.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01423f94668756dc9f644c5ef93ace0b2e1624d7dd9483f9524bdf3c0855d2ae
|
||||
size 3166632
|
||||
13
kio.changes
13
kio.changes
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org
|
||||
|
||||
- Update to 5.50.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/kde-frameworks-5.50.0.php
|
||||
- Changes since 5.49.0:
|
||||
* Too many changes to list here
|
||||
- Drop 0001-Revert-Support-NTFS-hidden-files.patch, the problem
|
||||
with the root folder being hidden has been fixed (or rather
|
||||
workarounded) upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 19 09:19:11 UTC 2018 - christophe@krop.fr
|
||||
|
||||
|
||||
8
kio.spec
8
kio.spec
@ -12,18 +12,18 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define _tar_path 5.49
|
||||
%define _tar_path 5.50
|
||||
# Full KF5 version (e.g. 5.33.0)
|
||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||
# Last major and minor KF5 version (e.g. 5.33)
|
||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
%bcond_without lang
|
||||
Name: kio
|
||||
Version: 5.49.0
|
||||
Version: 5.50.0
|
||||
Release: 0
|
||||
Summary: Network transparent access to files and data
|
||||
License: LGPL-2.1-or-later
|
||||
@ -33,8 +33,6 @@ 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-OPENSUSE
|
||||
Patch1: 0001-Revert-Support-NTFS-hidden-files.patch
|
||||
BuildRequires: cmake >= 3.0
|
||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||
BuildRequires: fdupes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user