c8885106c1
- Update from Plasma 5.7.0 to 5.7.1. - Remove the version number from the directory storing the Plasma Nix expressions. It is not necessary to version the Nix expressions now that we keep only one version in Nixpkgs. - Fix a bug in generate-kde-plasma.sh which prevented it from finding its helper script. - Automatically redirect the output of generate-kde-plasma.sh to make the update script even easier to use.
91 lines
4.1 KiB
Diff
91 lines
4.1 KiB
Diff
Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml
|
|
+++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
|
|
@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1
|
|
|
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
|
import org.kde.plasma.components 2.0 as PlasmaComponents
|
|
-import "logic.js" as Logic
|
|
+import "../code/logic.js" as Logic
|
|
|
|
Item {
|
|
id: analogclock
|
|
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
|
|
+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
|
|
@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
|
|
import org.kde.plasma.extras 2.0 as PlasmaExtras
|
|
import org.kde.plasma.workspace.components 2.0
|
|
import org.kde.kcoreaddons 1.0 as KCoreAddons
|
|
-import "logic.js" as Logic
|
|
+import "../code/logic.js" as Logic
|
|
|
|
Item {
|
|
id: batteryItem
|
|
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
|
|
+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
|
|
@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
|
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
|
import org.kde.plasma.components 2.0 as Components
|
|
import org.kde.plasma.workspace.components 2.0
|
|
-import "logic.js" as Logic
|
|
+import "../code/logic.js" as Logic
|
|
|
|
MouseArea {
|
|
id: root
|
|
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
|
|
+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
|
|
@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
|
|
import org.kde.plasma.components 2.0 as Components
|
|
import org.kde.plasma.extras 2.0 as PlasmaExtras
|
|
import org.kde.kquickcontrolsaddons 2.0
|
|
-import "logic.js" as Logic
|
|
+import "../code/logic.js" as Logic
|
|
|
|
FocusScope {
|
|
id: dialog
|
|
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
|
+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
|
@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
|
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
|
import org.kde.kcoreaddons 1.0 as KCoreAddons
|
|
import org.kde.kquickcontrolsaddons 2.0
|
|
-import "logic.js" as Logic
|
|
+import "../code/logic.js" as Logic
|
|
|
|
Item {
|
|
id: batterymonitor
|
|
Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml
|
|
+++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
|
|
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
|
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
|
import org.kde.plasma.components 2.0
|
|
import org.kde.kquickcontrolsaddons 2.0
|
|
-import "data.js" as Data
|
|
+import "../code/data.js" as Data
|
|
|
|
Flow {
|
|
id: lockout
|
|
Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
|
|
===================================================================
|
|
--- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml
|
|
+++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
|
|
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
|
|
|
|
import org.kde.plasma.private.notifications 1.0
|
|
|
|
-import "uiproperties.js" as UiProperties
|
|
+import "../code/uiproperties.js" as UiProperties
|
|
|
|
MouseEventListener {
|
|
id: notificationsApplet
|