Merge branch 'elogind'HEADmaster

1 files changed, 0 insertions, 31 deletions

diff --git a/kde/patch/kate/kate-15.12.0.patch b/kde/patch/kate/kate-15.12.0.patch
deleted file mode 100644
index 25067f4..0000000
--- a/kde/patch/kate/kate-15.12.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Michal Humpula <michal.humpula@hudrydum.cz>
-Date: Sun, 29 Nov 2015 10:24:42 +0000
-Subject: fix opening new files trough dbus
-X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=d61b121264d7b43d41c1c6417a18bbfb9078eb9d
----
-fix opening new files trough dbus
-
-REVIEW: 126197
----
-
-
---- a/urlinfo.h
-+++ b/urlinfo.h
-@@ -33,7 +33,7 @@
-         : cursor(KTextEditor::Cursor::invalid())
-     {
-         // convert to an url
--        const QRegularExpression withProtocol(QStringLiteral("^[a-zA-Z]+:")); // TODO: remove after Qt supports this on its own
-+        const QRegularExpression withProtocol(QStringLiteral("^[a-zA-Z]+://")); // TODO: remove after Qt supports this on its own
-         if (withProtocol.match(path).hasMatch()) {
-             url = QUrl::fromUserInput(path);
-         } else {
-@@ -50,7 +50,7 @@
-                 int line = match.captured(1).toInt() - 1;
-                 // don't use an invalid column when the line is valid
-                 int column = qMax(0, match.captured(2).toInt() - 1);
--                url = QUrl::fromLocalFile(path);
-+                url = QUrl::fromLocalFile(QDir::current().absoluteFilePath(path));
-                 cursor = {line, column};
-             }
-         }