Accepting request 623290 from KDE:Frameworks5
KDE Frameworks 5.48.0 (forwarded request 623248 from luca_b) OBS-URL: https://build.opensuse.org/request/show/623290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
53bb4f0991
@ -15,11 +15,11 @@ http://bugzilla.opensuse.org/show_bug.cgi?id=1091780
|
||||
src/ioslaves/file/file_unix.cpp | 54 -----------------------------------------
|
||||
1 file changed, 54 deletions(-)
|
||||
|
||||
diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
|
||||
index afa2bd3f..826c46cd 100644
|
||||
--- a/src/ioslaves/file/file_unix.cpp
|
||||
+++ b/src/ioslaves/file/file_unix.cpp
|
||||
@@ -37,9 +37,6 @@
|
||||
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>
|
||||
@ -29,7 +29,7 @@ index afa2bd3f..826c46cd 100644
|
||||
#include <utime.h>
|
||||
|
||||
#include <KAuth>
|
||||
@@ -413,52 +410,6 @@ static bool isLocalFileSameHost(const QUrl &url)
|
||||
@@ -416,52 +413,6 @@ static bool isLocalFileSameHost(const QU
|
||||
return (QString::compare(url.host(), QLatin1String(hostname), Qt::CaseInsensitive) == 0);
|
||||
}
|
||||
|
||||
@ -82,18 +82,15 @@ index afa2bd3f..826c46cd 100644
|
||||
void FileProtocol::listDir(const QUrl &url)
|
||||
{
|
||||
if (!isLocalFileSameHost(url)) {
|
||||
@@ -555,11 +506,6 @@ void FileProtocol::listDir(const QUrl &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.insert(KIO::UDSEntry::UDS_HIDDEN, 1);
|
||||
- entry.fastInsert(KIO::UDSEntry::UDS_HIDDEN, 1);
|
||||
- }
|
||||
-#endif
|
||||
listEntry(entry);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:51122eae0b32cb11a20e2c4862c9770d55aac1a1c6d969b6e899fb06736f8720
|
||||
size 3159580
|
||||
3
kio-5.48.0.tar.xz
Normal file
3
kio-5.48.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:40b9b04dc1e53a4e752e234c5dceee47b34aac521849a47b2bab45b7b81da02a
|
||||
size 3164728
|
||||
12
kio.changes
12
kio.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 16 04:37:41 UTC 2018 - lbeltrame@kde.org
|
||||
|
||||
- Update to 5.48.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/kde-frameworks-5.48.0.php
|
||||
- Changes since 5.47.0:
|
||||
* Too many changes to list here
|
||||
- Refreshed patches:
|
||||
* 0001-Revert-Support-NTFS-hidden-files.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 13 04:41:37 UTC 2018 - lbeltrame@kde.org
|
||||
|
||||
|
||||
21
kio.spec
21
kio.spec
@ -17,15 +17,14 @@
|
||||
|
||||
|
||||
%bcond_without lang
|
||||
%define _tar_path 5.47
|
||||
%define _tar_path 5.48
|
||||
Name: kio
|
||||
Version: 5.47.0
|
||||
Version: 5.48.0
|
||||
Release: 0
|
||||
%define kf5_version %{version}
|
||||
# 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
Summary: Network transparent access to files and data
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/GUI/KDE
|
||||
@ -36,6 +35,10 @@ Source1: baselibs.conf
|
||||
Patch0: kio_help-fallback-to-kde4-docs.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: 0001-Revert-Support-NTFS-hidden-files.patch
|
||||
%if 0%{?suse_version} < 1330
|
||||
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
|
||||
BuildRequires: gcc7-c++
|
||||
%endif
|
||||
BuildRequires: cmake >= 3.0
|
||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||
BuildRequires: fdupes
|
||||
@ -129,6 +132,11 @@ Development files.
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} < 1330
|
||||
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
|
||||
export CC=gcc-7
|
||||
export CXX=g++-7
|
||||
%endif
|
||||
%cmake_kf5 -d build
|
||||
%make_jobs
|
||||
|
||||
@ -154,6 +162,8 @@ Development files.
|
||||
%endif
|
||||
|
||||
%files core
|
||||
%doc README*
|
||||
%license COPYING*
|
||||
%{_kf5_libdir}/libKF5KIOCore.so.*
|
||||
%{_kf5_configdir}/accept-languages.codes
|
||||
%{_kf5_libdir}/libKF5KIONTLM.so.*
|
||||
@ -190,7 +200,8 @@ Development files.
|
||||
%{_kf5_sharedir}/kconf_update/filepicker.upd
|
||||
|
||||
%files
|
||||
%doc COPYING* README*
|
||||
%doc README*
|
||||
%license COPYING*
|
||||
%{_kf5_libdir}/libKF5KIOGui.so.*
|
||||
%{_kf5_libdir}/libKF5KIOWidgets.so.*
|
||||
%{_kf5_libdir}/libKF5KIOFileWidgets.so.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user