kde5.plasma-desktop: move patches to quilt

7 files changed, 88 insertions, 126 deletions

diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
deleted file mode 100644
index ca85119e97f..00000000000
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a91568d7c6635f4d66bb4e8ebaf2666c24980312 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Sat, 14 May 2016 12:54:27 +0200
-Subject: [PATCH] qml import paths
-
----
- applets/pager/package/contents/ui/main.qml              | 2 +-
- containments/desktop/package/contents/ui/FolderView.qml | 2 +-
- containments/desktop/package/contents/ui/main.qml       | 4 ++--
- containments/panel/contents/ui/main.qml                 | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
-index b8eb8a6..fad3f69 100644
---- a/applets/pager/package/contents/ui/main.qml
-+++ b/applets/pager/package/contents/ui/main.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- 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
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
-index ced3507..6073545 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
- 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
-diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
-index a438b74..b907a36 100644
---- a/containments/desktop/package/contents/ui/main.qml
-+++ b/containments/desktop/package/contents/ui/main.qml
-@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
- 
- 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
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index 4d71c6e..337c356 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- 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
--- 
-2.8.0
-
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
deleted file mode 100644
index aba97b032f8..00000000000
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0a8e2ae5cb64c5762408df920d99459b20d52b29 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 09:39:24 -0600
-Subject: [PATCH 3/3] tzdir
-
----
- kcms/dateandtime/helper.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index 5171753..92b5d9e 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
-+    QString tz = tzdir + "/" + selectedzone;
-+    if (tzdir.isEmpty()) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove(QStringLiteral("/etc/localtime"));
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
index 8d4098ca31f..21ceec25d53 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
@@ -1,13 +1,14 @@
 {
-  plasmaPackage, substituteAll,
+  plasmaPackage, lib, copyPathsToStore,
   ecm, kdoctools,
   attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
   kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
   kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
   libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
-  plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev,
-  xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux
+  plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras,
+  xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver,
+  utillinux
 }:
 
 plasmaPackage rec {
@@ -22,15 +23,12 @@ plasmaPackage rec {
     ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
     qtquickcontrols qtx11extras ksysguard
   ];
-  patches = [
-    ./0001-qt-5.5-QML-import-paths.patch
-    (substituteAll {
-      src = ./0002-hwclock.patch;
-      hwclock = "${utillinux}/sbin/hwclock";
-    })
-    ./0003-tzdir.patch
-  ];
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
+    substituteInPlace kcms/dateandtime/helper.cpp \
+        --subst-var hwclock "${utillinux}/sbin/hwclock"
+
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
   NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
index 17b01486d92..5623de84668 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
@@ -1,16 +1,7 @@
-From d0056fa6c1158408db169a7f5e6eb75691083094 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 09:34:43 -0600
-Subject: [PATCH 2/3] hwclock
-
----
- kcms/dateandtime/helper.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index e955f0c..5171753 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
+Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
+===================================================================
+--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
 @@ -48,10 +48,6 @@
  #include <sys/stat.h>
  #endif
@@ -31,6 +22,3 @@ index e955f0c..5171753 100644
      if (!hwclock.isEmpty()) {
          KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
      }
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
new file mode 100644
index 00000000000..def5b577b97
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
@@ -0,0 +1,54 @@
+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
+===================================================================
+--- 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
+===================================================================
+--- plasma-desktop-5.8.5.orig/containments/panel/contents/ui/main.qml
++++ 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/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/kde-5/plasma/plasma-desktop/series
new file mode 100644
index 00000000000..6334deb7d97
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/series
@@ -0,0 +1,3 @@
+qml-import-paths.patch
+hwclock-path.patch
+tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
new file mode 100644
index 00000000000..97504b330fe
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
@@ -0,0 +1,18 @@
+Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
+===================================================================
+--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
+@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele
+ 
+     val = selectedzone;
+ #else
+-    QString tz = "/usr/share/zoneinfo/" + selectedzone;
++    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
++    QString tz = tzdir + "/" + selectedzone;
++    if (tzdir.isEmpty()) {
++      // Standard Linux path
++      tz = "/usr/share/zoneinfo/" + selectedzone;
++    }
+ 
+     if (QFile::exists(tz)) { // make sure the new TZ really exists
+         QFile::remove(QStringLiteral("/etc/localtime"));