diff --git a/0001-Remove-old-kio_fonts-hack-in-KCoreDirLister-hostname.patch b/0001-Remove-old-kio_fonts-hack-in-KCoreDirLister-hostname.patch deleted file mode 100644 index 1d8334d..0000000 --- a/0001-Remove-old-kio_fonts-hack-in-KCoreDirLister-hostname.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bd04dfb4d9dbf2d29c5a5c18bfce15f926996e5e Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Fri, 11 Sep 2020 18:26:47 +0200 -Subject: [PATCH 1/2] Remove old kio_fonts hack in KCoreDirLister, hostname was - stripped incorrectly - -https://bugs.kde.org/show_bug.cgi?id=160057 worked around the fact that -kio_fonts was creating URLs like fonts://System/, and yet there's no -hostname during directory listing afterwards. - -Nowadays: -1) this hack isn't needed anymore, kio_fonts does fonts:/System/ -2) removing it actually fixes navigating from `dolphin fonts:/` ---- - src/core/kcoredirlister.cpp | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp -index e9a756a4..8a548949 100644 ---- a/src/core/kcoredirlister.cpp -+++ b/src/core/kcoredirlister.cpp -@@ -90,16 +90,6 @@ bool KCoreDirListerCache::listDir(KCoreDirLister *lister, const QUrl &_u, - QUrl _url(_u); - _url.setPath(QDir::cleanPath(_url.path())); // kill consecutive slashes - -- if (!_url.host().isEmpty() && KProtocolInfo::protocolClass(_url.scheme()) == QLatin1String(":local") -- && _url.scheme() != QLatin1String("file")) { -- // ":local" protocols ignore the hostname, so strip it out preventively - #160057 -- // kio_file is special cased since it does honor the hostname (by redirecting to e.g. smb) -- _url.setHost(QString()); -- if (_keep == false) { -- emit lister->redirection(_url); -- } -- } -- - // like this we don't have to worry about trailing slashes any further - _url = _url.adjusted(QUrl::StripTrailingSlash); - --- -2.25.1 - diff --git a/0002-KUrlCompletion-accommodate-local-protocols-that-use-.patch b/0002-KUrlCompletion-accommodate-local-protocols-that-use-.patch deleted file mode 100644 index 21451c6..0000000 --- a/0002-KUrlCompletion-accommodate-local-protocols-that-use-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 37440b39539d32e6e2d8ba840ae670348554d0d8 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir -Date: Sat, 12 Sep 2020 20:45:44 +0200 -Subject: [PATCH 2/2] KUrlCompletion: accommodate ":local" protocols that use - hostname in url - -An example of that is kdeconnect://, offering completions for it is -redundant since it uses the hostname part of the url as the deviceId (a -sequence of letters and numbers that's not easy to remember), so can't use -that, and the UDS_NAME is the pretty name (e.g. SM-J500H) users see listed in -kdeconnect:// but kdeconnect://SM-J500H doesn't work. Also because the code in -KUrlCompletion::_k_slotEntries() is expecting a list of files/dirs to offer -as completions, and not hostnames (_k_slotEntries uses addPathtoUrl helper -method), no useful completions are feasible. - -Instead if the "filename" part of the url is empty we just skip it. - -Note that this prevents the code from hitting an assert in addPathToUrl -(after applying https://invent.kde.org/frameworks/kio/-/merge_requests/127 -which is needed to make accessing devices using the kdeconnect ioslave -actually work at all). ---- - src/widgets/kurlcompletion.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/widgets/kurlcompletion.cpp b/src/widgets/kurlcompletion.cpp -index 88bbaace..849a0f38 100644 ---- a/src/widgets/kurlcompletion.cpp -+++ b/src/widgets/kurlcompletion.cpp -@@ -1213,9 +1213,14 @@ void KUrlCompletionPrivate::_k_slotEntries(KIO::Job *, const KIO::UDSEntryList & - entry_name = entry.stringValue(KIO::UDSEntry::UDS_NAME); - } - -- //qDebug() << "name:" << name; -+ // This can happen with kdeconnect://deviceId as a completion for kdeconnect:/, -+ // there's no fileName [and the UDS_NAME is unrelated, can't use that]. -+ // This code doesn't support completing hostnames anyway (see addPathToUrl below). -+ if (entry_name.isEmpty()) { -+ continue; -+ } - -- if ((!entry_name.isEmpty() && entry_name.at(0) == QLatin1Char('.')) && -+ if (entry_name.at(0) == QLatin1Char('.') && - (list_urls_no_hidden || - entry_name.length() == 1 || - (entry_name.length() == 2 && entry_name.at(1) == QLatin1Char('.')))) { --- -2.25.1 - diff --git a/kio-5.74.0.tar.xz b/kio-5.74.0.tar.xz deleted file mode 100644 index 8caf3ac..0000000 --- a/kio-5.74.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e567872d42c92dde79189ad0ca32913dbc0ae09331715c5d33052223e1d2fdbf -size 3281128 diff --git a/kio-5.74.0.tar.xz.sig b/kio-5.74.0.tar.xz.sig deleted file mode 100644 index 8f4cb7e..0000000 --- a/kio-5.74.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl9bTdYACgkQWNDuZIpI -s7vkSgf+K19TrI2ankEZg+vOItYM6t6vNDBaQ6CX7UNQ9cCGPmP+dqft4Wn4GjvS -mMeocpoPLBPADbFuWmQUxKjPdoHXvLvAikt7KIuMfYy+jHiSBF8LH7n6ye9zi6wn -l6rxADZmzOhQVNrf1tNXSPJhxUDiP2sFeHXcn4uN/nXrn7pNo7/mWATWqnOix+V4 -ZbkUoIYKp6YFk//HefonstlAQO9W6auoeWdoye0X6RsE82Om8lmlwgdkgbKcRKj3 -mnia+QGiH2YNzBqMQ6x35Vtd8AelJHe3lz5YbrWyDujS4wJcimXL4BJ9EafaQoqi -ZJz3cT2mgXFfqt4KKprpowIwB6v05A== -=ypdi ------END PGP SIGNATURE----- diff --git a/kio-5.75.0.tar.xz b/kio-5.75.0.tar.xz new file mode 100644 index 0000000..44c81ee --- /dev/null +++ b/kio-5.75.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27af8d83d0ea6c68fc62675a0d0d34e94489e9e518c4a4c32fa9d4784510bc8e +size 3277424 diff --git a/kio-5.75.0.tar.xz.sig b/kio-5.75.0.tar.xz.sig new file mode 100644 index 0000000..691f243 --- /dev/null +++ b/kio-5.75.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl96NMMACgkQWNDuZIpI +s7vWWwf9EnkmrWWbqK0C374f4V3IfIWXZXXKpqIXX/B5A4c+Y1eoivr95t10TqH6 +cFiX6+Iy/QoOgV9HS87PjV4hwGEms6vSkpBoF3OQJdxrj5N6O7AqDDGX8UND4Per +2M7k6HmdSbYefvW7LsOuTumkWYXSR5FTkIhD1LAKy8Iu/fMcNxiJcKUgohuvE9dm +Lyfe+T+MGZe/xMMFmpy4aSnp2/PzyofZkUOMgsdj7C6+/G+1PdzhKEBdQekDoEPH +/cm2KM4+i1D2njDFG7USO+OGu9J1SMH4YeAM2CyHJjbiiJlzh9Nxi4UPNZ1pK6gE +wl6Z9V3SGgvp6xUAeYG4+/gMhCC27A== +=UZD3 +-----END PGP SIGNATURE----- diff --git a/kio.changes b/kio.changes index 03d2197..985ef5e 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Oct 5 08:33:19 UTC 2020 - Christophe Giboudeaux + +- Update to 5.75.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.75.0 +- Too many changes since 5.74.0, only listing bugfixes: + * kio_trash: remove unnecessarily strict permission check (kde#76380) + * OpenUrlJob: handle all text scripts consistently (kde#425829) + * KDirOperator: don't call setCurrentItem on an empty url (kde#425163) + * KNewFileMenu: fix creating new dir with name starting with ':' (kde#425396) + * Allow double quotes in filenames in KFileWidget (kde#185433) + * StatJob: cancel job if url is invalid (kde#426367) +- Drop upstream patches: + * 0001-Remove-old-kio_fonts-hack-in-KCoreDirLister-hostname.patch + * 0002-KUrlCompletion-accommodate-local-protocols-that-use-.patch + ------------------------------------------------------------------- Sun Sep 13 09:41:06 UTC 2020 - Fabian Vogt diff --git a/kio.spec b/kio.spec index c753eca..cad7153 100644 --- a/kio.spec +++ b/kio.spec @@ -16,14 +16,14 @@ # -%define _tar_path 5.74 +%define _tar_path 5.75 # 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.74.0 +Version: 5.75.0 Release: 0 Summary: Network transparent access to files and data License: LGPL-2.1-or-later @@ -37,9 +37,6 @@ Source2: frameworks.keyring Source99: 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: 0001-Remove-old-kio_fonts-hack-in-KCoreDirLister-hostname.patch -Patch2: 0002-KUrlCompletion-accommodate-local-protocols-that-use-.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem