From e73351b832cf819fe7018de268d42b6b065a21b6 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 17 Dec 2015 16:29:42 +0100 Subject: Patch for kate - openning and closing files. --- kde/patch/kate.patch | 4 +++ kde/patch/kate/kate-15.12.0.patch | 31 ++++++++++++++++++++++ .../plasma-desktop_kickoff_kdebug_356398.patch | 24 +++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 kde/patch/kate.patch create mode 100644 kde/patch/kate/kate-15.12.0.patch create mode 100644 kde/patch/plasma-desktop/plasma-desktop_kickoff_kdebug_356398.patch (limited to 'kde') diff --git a/kde/patch/kate.patch b/kde/patch/kate.patch new file mode 100644 index 0000000..27c2d0c --- /dev/null +++ b/kde/patch/kate.patch @@ -0,0 +1,4 @@ +# Last-minute fixes for opening and closing files: +# Should be fixed after 15.12.0. +cat $CWD/patch/kate/kate-15.12.0.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kate/kate-15.12.0.patch b/kde/patch/kate/kate-15.12.0.patch new file mode 100644 index 0000000..25067f4 --- /dev/null +++ b/kde/patch/kate/kate-15.12.0.patch @@ -0,0 +1,31 @@ +From: Michal Humpula +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}; + } + } diff --git a/kde/patch/plasma-desktop/plasma-desktop_kickoff_kdebug_356398.patch b/kde/patch/plasma-desktop/plasma-desktop_kickoff_kdebug_356398.patch new file mode 100644 index 0000000..a4d8d9f --- /dev/null +++ b/kde/patch/plasma-desktop/plasma-desktop_kickoff_kdebug_356398.patch @@ -0,0 +1,24 @@ +From: Eike Hein +Date: Tue, 08 Dec 2015 19:26:26 +0000 +Subject: Fix migration of multiple favorites. +X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=97ced66da372737ae5d36d86c9bc0c6fe684d842 +--- +Fix migration of multiple favorites. + +BUG:356398 +--- + + +--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js ++++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js +@@ -1,7 +1,7 @@ + var kickoffConfig = ConfigFile("kickoffrc"); + + kickoffConfig.group = "Favorites"; +-var favorites = kickoffConfig.readEntry("FavoriteURLs"); ++var favorites = kickoffConfig.readEntry("FavoriteURLs").split(','); + + kickoffConfig.group = "SystemApplications"; + var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(','); + + -- cgit v1.2.3