diff options
Diffstat (limited to 'pkgs/desktops/plasma-5/plasma-desktop')
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/ibus.patch | 26 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch | 27 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/series | 1 |
3 files changed, 7 insertions, 47 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch deleted file mode 100644 index d5ac4b25087..00000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp -+++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout - - bool XkbHelper::preInitialize() - { -- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module -- -- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus")); -- if( ibusExe.isEmpty() ) { -- return 0; -- } -- -- KProcess ibusProcess; -- ibusProcess << ibusExe << QStringLiteral("exit"); -- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels); -- int res = ibusProcess.execute(); -- -- if( res == 0 ) { -- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped"; -- } -- - return 0; - } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch index def5b577b97..d3f5166d5ed 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch @@ -1,27 +1,14 @@ -Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -=================================================================== ---- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml -+++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml =================================================================== --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml @@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.folder 0.1 as Folder -import "FolderTools.js" as FolderTools +import "../code/FolderTools.js" as FolderTools - + Item { id: main Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -29,14 +16,14 @@ Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - + -import "LayoutManager.js" as LayoutManager -import "FolderTools.js" as FolderTools +import "../code/LayoutManager.js" as LayoutManager +import "../code/FolderTools.js" as FolderTools - + DragDrop.DropArea { id: root Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -46,9 +33,9 @@ Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as import org.kde.kquickcontrolsaddons 2.0 import org.kde.draganddrop 2.0 as DragDrop - + -import "LayoutManager.js" as LayoutManager +import "../code/LayoutManager.js" as LayoutManager - + DragDrop.DropArea { id: root diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series index 36778cd1c56..6334deb7d97 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/series +++ b/pkgs/desktops/plasma-5/plasma-desktop/series @@ -1,4 +1,3 @@ qml-import-paths.patch hwclock-path.patch tzdir.patch -ibus.patch |