Accepting request 719941 from KDE:Frameworks5

Plasma 5.16.4

OBS-URL: https://build.opensuse.org/request/show/719941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kde-cli-tools5?expand=0&rev=89
This commit is contained in:
Dominique Leuenberger 2019-08-05 08:34:23 +00:00 committed by Git OBS Bridge
commit fbfc302ddd
7 changed files with 27 additions and 57 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee68a8f958e1ce503252689d66eeb9897bad6b7e44f760c654d49225b3d55cd7
size 587072

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl0kwaUACgkQ7JTRj38F
mX53Zwf/QZzbBm7iysJ9ok/CBgRuasHdmvjtQS/xz5m7nxXvtICwPv5BCZxYD2G+
oVfRlAg+XqgZgsjUiQt0blH6vJ3zhrzFqn/GclPu7evK+AwUdZGWThtZFLzg7df3
+aMR7R8HL35CiLVpk9R81C/KJfMG4b1Yp1dwKl/BNnNEu+pp66xXG1We2K80BrJB
jcAOs8RkO8jzMnVkDw2KYEr6ntrECg0QnQMTpOEZ5B5OD0LKQAnSKHq/5OF+y/Tb
mvxgKyQcDDkgDL92Mf2lOZNZnpMPG41GEdcT2MsnNkwKOl6U+wlf1vCEJRWN6EVX
gMv7WS/Ud0pMJCWA29KadzESZSMjfw==
=5ZyB
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d
size 587576

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl1AGQsACgkQ7JTRj38F
mX7BbQgAlOUoBJicaCxSH352ECtppxnijo4nf0TsnY7dNwTdYWs5LIQWbbUdA71G
LU9m30E8h2L64jxWGSEAygaCHAg6ovHRAaV19cxQQqjJJ6EO9rlKzp4pJxvqcs3g
wmO7Xstvin37OGFZn0FRnBcV6k/vlH7AhUtnkfaRox46ysFZq+bQO3Ch16klX6IR
pSNOOsd0E4cHWcTQTvCNqrGzbI/gyK9WAo94kQeer/p3SeLPlUzANuoc6Nnf2xwl
rLZuynFSU4xjxYM8LK2qtLQ1CdA8mEzoOiPi4YUQ72vQHBJ8+EEk+CWAzkhzvZxT
fr+R2s9SzaftHrFLomNwzKweGWwKYQ==
=Tfeo
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jul 30 12:40:17 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.16.4
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.16.4.php
- Changes since 5.16.3:
* kioclient: Don't convert `:x:y` to `?line=x&column=y` for URLs starting with remote schemes. (kde#408632)
- Drop patches, now upstream:
* kde408632.patch
-------------------------------------------------------------------
Sat Jul 20 19:09:02 UTC 2019 - wbauer@tmo.at

View File

@ -19,7 +19,7 @@
%define kf5_version 5.54.0
%bcond_without lang
Name: kde-cli-tools5
Version: 5.16.3
Version: 5.16.4
Release: 0
Summary: Additional CLI tools for KDE applications
License: GPL-2.0-or-later
@ -32,8 +32,6 @@ Source2: plasma.keyring
%endif
# PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256
Patch0: kdesu-add-some-i18n-love.patch
# PATCH-FIX-UPSTREAM
Patch1: kde408632.patch
BuildRequires: extra-cmake-modules >= 1.3.0
BuildRequires: kf5-filesystem
BuildRequires: xz

View File

@ -1,40 +0,0 @@
From 42ef318a9d1c454f96b60181d8231a59233720ea Mon Sep 17 00:00:00 2001
From: Gleb Popov <6yearold@gmail.com>
Date: Thu, 18 Jul 2019 13:00:19 +0400
Subject: kioclient: Don't convert `:x:y` to `?line=x&column=y` for URLs
starting with remote schemes.
BUG: 408632
Test Plan: `kioclient5 exec http://localhost:9000` now works correctly.
Subscribers: plasma-devel, #frameworks
Differential Revision: https://phabricator.kde.org/D22525
---
kioclient/urlinfo.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/kioclient/urlinfo.h b/kioclient/urlinfo.h
index b9635c7..ebe0419 100644
--- a/kioclient/urlinfo.h
+++ b/kioclient/urlinfo.h
@@ -52,6 +52,15 @@ public:
}
/**
+ * if the path starts with http:// or any other scheme, except file://
+ * we also don't want to do anything with URL
+ */
+ if (!QUrl(pathOrUrl).isLocalFile()) {
+ url = QUrl::fromUserInput(pathOrUrl, QDir::currentPath(), QUrl::DefaultResolution);
+ return;
+ }
+
+ /**
* ok, the path as is, is no existing file, now, cut away :xx:yy stuff as cursor
* this will make test:50 to test with line 50
*/
--
cgit v1.1