diff --git a/0001-Revert-Support-NTFS-hidden-files.patch b/0001-Revert-Support-NTFS-hidden-files.patch index 0254b65..631a0c2 100644 --- a/0001-Revert-Support-NTFS-hidden-files.patch +++ b/0001-Revert-Support-NTFS-hidden-files.patch @@ -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 #include @@ -29,7 +29,7 @@ index afa2bd3f..826c46cd 100644 #include #include -@@ -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 - diff --git a/kio-5.47.0.tar.xz b/kio-5.47.0.tar.xz deleted file mode 100644 index cec792c..0000000 --- a/kio-5.47.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51122eae0b32cb11a20e2c4862c9770d55aac1a1c6d969b6e899fb06736f8720 -size 3159580 diff --git a/kio-5.48.0.tar.xz b/kio-5.48.0.tar.xz new file mode 100644 index 0000000..8433544 --- /dev/null +++ b/kio-5.48.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40b9b04dc1e53a4e752e234c5dceee47b34aac521849a47b2bab45b7b81da02a +size 3164728 diff --git a/kio.changes b/kio.changes index b74f716..c8817b5 100644 --- a/kio.changes +++ b/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 @@ -12,16 +24,16 @@ Wed Jun 13 04:41:37 UTC 2018 - lbeltrame@kde.org * Auth support: Create socket file in user's runtime directory * Auth support: Delete socket file after use * Auth support: Move task of cleaning up socket file to FdReceiver - * Auth support: In linux don't use abstract socket to share file + * Auth support: In linux don't use abstract socket to share file descriptor * [kcoredirlister] Remove as many url.toString() as possible * KFileItemActions: fallback to default mimetype when selecting only files (kde#393710) * Introduce KFileItemListProperties::isFile() - * KPropertiesDialogPlugin can now specify multiple supported protocols + * KPropertiesDialogPlugin can now specify multiple supported protocols using X-KDE-Protocols * Preserve fragment when redirecting from http to https - * [KUrlNavigator] Emit tabRequested when path in path selector menu is + * [KUrlNavigator] Emit tabRequested when path in path selector menu is middle-clicked * Performance: use the new uds implementation * Don't redirect smb:/ to smb:// and then to smb:/// @@ -31,7 +43,7 @@ Wed Jun 13 04:41:37 UTC 2018 - lbeltrame@kde.org * i18n: use plural form again for plugin message * Use a regular dialog rather than a list dialog when trashing or deleting a single file - * Make the warning text for deletion operations emphasize its permanency + * Make the warning text for deletion operations emphasize its permanency and irreversibility * Revert "Show view mode buttons in the open/save dialog's toolbar" diff --git a/kio.spec b/kio.spec index 76dff2a..cf2bdc0 100644 --- a/kio.spec +++ b/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.*