From 0498fcd4b1c89919d44687ea8e1251be5b1eb972dc596b890221bf26c67ee3f9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 22 Jul 2019 10:41:13 +0000 Subject: [PATCH] Accepting request 717529 from home:wolfi323:test - Add kde408632.patch to fix kde-open5 incorrectly handling port numbers in URLs (boo#1138956, kde#408632) OBS-URL: https://build.opensuse.org/request/show/717529 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=239 --- kde-cli-tools5.changes | 6 ++++++ kde-cli-tools5.spec | 2 ++ kde408632.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 kde408632.patch diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 165908d..a172a3a 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 20 19:09:02 UTC 2019 - wbauer@tmo.at + +- Add kde408632.patch to fix kde-open5 incorrectly handling port + numbers in URLs (boo#1138956, kde#408632) + ------------------------------------------------------------------- Tue Jul 9 17:29:05 UTC 2019 - fabian@ritter-vogt.de diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 3c256b0..55b806d 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -32,6 +32,8 @@ 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 diff --git a/kde408632.patch b/kde408632.patch new file mode 100644 index 0000000..f39d5bc --- /dev/null +++ b/kde408632.patch @@ -0,0 +1,40 @@ +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 +