Commit 43dacb64 authored by K900's avatar K900
Browse files

kdePackages: Plasma 6.5.5 -> 6.6.0

parent 2a4aa321

pkgs/kde/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ let 
        oxygen-icons = self.callPackage ./misc/oxygen-icons { };

        phonon = self.callPackage ./misc/phonon { };

        phonon-vlc = self.callPackage ./misc/phonon-vlc { };

        plasma-keyboard = self.callPackage ./misc/plasma-keyboard { };

        plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { };

        polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { };

        pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { };

pkgs/kde/generated/sources/plasma.json

+225 −210

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch

+2 −2
Original line number Diff line number Diff line 
--- a/src/aurorae.cpp

+++ b/src/aurorae.cpp

--- a/v1/aurorae.cpp

+++ b/v1/aurorae.cpp

@@ -201,7 +201,7 @@ void Helper::init()

     // so let's try to locate our plugin:

     QString pluginPath;

pkgs/kde/plasma/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -47,11 +47,14 @@ 
  plasma-disks = callPackage ./plasma-disks { };

  plasma-firewall = callPackage ./plasma-firewall { };

  plasma-integration = callPackage ./plasma-integration { };

  plasma-keyboard = callPackage ./plasma-keyboard { };

  plasma-login-manager = callPackage ./plasma-login-manager { };

  plasma-mobile = callPackage ./plasma-mobile { };

  plasma-nano = callPackage ./plasma-nano { };

  plasma-nm = callPackage ./plasma-nm { };

  plasma-pa = callPackage ./plasma-pa { };

  plasma-sdk = callPackage ./plasma-sdk { };

  plasma-setup = callPackage ./plasma-setup { };

  plasma-systemmonitor = callPackage ./plasma-systemmonitor { };

  plasma-thunderbolt = callPackage ./plasma-thunderbolt { };

  plasma-vault = callPackage ./plasma-vault { };

pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch

+50 −49
Original line number Diff line number Diff line 
diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json

index 7ece92ee..a4fb6664 100644

index 5648bb73..28db7ffb 100644

--- a/kcms/audio_information/kcm_audio_information.json

+++ b/kcms/audio_information/kcm_audio_information.json

@@ -82,7 +82,7 @@
@@ -25,7 +25,7 @@ index adb196fd..9d6c8675 100644 
     CommandOutputContext *outputContext() const

     {

diff --git a/kcms/block_devices/kcm_block_devices.json b/kcms/block_devices/kcm_block_devices.json

index f73cf5a5..b18ecbfb 100644

index 5d864d49..8ea55707 100644

--- a/kcms/block_devices/kcm_block_devices.json

+++ b/kcms/block_devices/kcm_block_devices.json

@@ -82,7 +82,7 @@
@@ -51,10 +51,10 @@ index 2de923f3..6b14f7fb 100644 
     CommandOutputContext *outputContext() const

     {

diff --git a/kcms/cpu/kcm_cpu.json b/kcms/cpu/kcm_cpu.json

index e8fb086e..c87b98f8 100644

index 7541b258..3ba7f289 100644

--- a/kcms/cpu/kcm_cpu.json

+++ b/kcms/cpu/kcm_cpu.json

@@ -104,7 +104,7 @@

@@ -102,7 +102,7 @@

         "Name[zh_CN]": "CPU",

         "Name[zh_TW]": "CPU"

     },
@@ -64,15 +64,15 @@ index e8fb086e..c87b98f8 100644 
     "X-KDE-Keywords": "cpu,amd,intel,arm,instructions,cores,architecture,byte order",

     "X-KDE-Keywords[ar]": "cpu,amd,intel,arm,instructions,cores,architecture,byte order,تعليمات,أنوية,معمارية",

diff --git a/kcms/cpu/main.cpp b/kcms/cpu/main.cpp

index 608381eb..8fd7914f 100644

index 96481ffb..198fef96 100644

--- a/kcms/cpu/main.cpp

+++ b/kcms/cpu/main.cpp

@@ -16,7 +16,7 @@ public:

     explicit KCMCPU(QObject *parent, const KPluginMetaData &data)

         : KQuickConfigModule(parent, data)

     {

-        m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {}, parent);

+        m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {}, parent);

-        m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {QStringLiteral("--hierarchic=always")}, parent);

+        m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {QStringLiteral("--hierarchic=always")}, parent);

     }

     CommandOutputContext *outputContext() const

     {
@@ -90,18 +90,18 @@ index da803598..4e24eaaf 100755 
     printf "%s\n\n" "$data"

 done

diff --git a/kcms/edid/kcm_edid.json b/kcms/edid/kcm_edid.json

index e180df8d..3d5bbd0b 100644

index 4639da41..1afb5522 100644

--- a/kcms/edid/kcm_edid.json

+++ b/kcms/edid/kcm_edid.json

@@ -72,7 +72,7 @@

@@ -74,7 +74,7 @@

         "Name[zh_CN]": "EDID",

         "Name[zh_TW]": "EDID"

     },

-    "TryExec": "di-edid-decode",

+    "TryExec": "@di_edid_decode@",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "EDID,Graphics",

     "X-KDE-Keywords[ar]": "EDID,Graphics,الرسوميات,بيانات تعريف العرض الممتدة",

     "X-KDE-Keywords": "EDID,Graphics,dxdiag",

     "X-KDE-Keywords[ar]": "EDID,Graphics,الرسوميات,بيانات تعريف العرض الممتدة,dxdiag",

diff --git a/kcms/edid/main.cpp b/kcms/edid/main.cpp

index 9f04e7fd..8ef37d2c 100644

--- a/kcms/edid/main.cpp
@@ -116,18 +116,18 @@ index 9f04e7fd..8ef37d2c 100644 
     [[nodiscard]] CommandOutputContext *outputContext() const

     {

diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json

index 02a90071..64bfb609 100644

index a5a21cd6..cddef596 100644

--- a/kcms/egl/kcm_egl.json

+++ b/kcms/egl/kcm_egl.json

@@ -104,7 +104,7 @@

@@ -102,7 +102,7 @@

         "Name[zh_CN]": "OpenGL (EGL)",

         "Name[zh_TW]": "OpenGL (EGL)"

     },

-    "TryExec": "eglinfo",

+    "TryExec": "@eglinfo@",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL",

     "X-KDE-Keywords[ar]": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,بطاقة الرسوميات,تسريع العتاد,رسوميات",

     "X-KDE-Keywords": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,dxdiag",

     "X-KDE-Keywords[ar]": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,بطاقة الرسوميات,تسريع العتاد,رسوميات,dxdiag",

diff --git a/kcms/egl/main.cpp b/kcms/egl/main.cpp

index 1a509dac..886a62d8 100644

--- a/kcms/egl/main.cpp
@@ -155,18 +155,18 @@ index eab20e0f..5a0d2499 100644 
                                                    {executable},

                                                    Qt::TextFormat::RichText,

diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json

index 8a56690a..e2caaec7 100644

index 900d8d6a..c1bef34f 100644

--- a/kcms/glx/kcm_glx.json

+++ b/kcms/glx/kcm_glx.json

@@ -103,7 +103,7 @@

@@ -101,7 +101,7 @@

         "Name[zh_CN]": "OpenGL (GLX)",

         "Name[zh_TW]": "OpenGL (GLX)"

     },

-    "TryExec": "glxinfo",

+    "TryExec": "@glxinfo@",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display",

     "X-KDE-Keywords[ar]": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,بطاقة الرسوميات,تسريع العتاد,الرسوميات",

     "X-KDE-Keywords": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,dxdiag",

     "X-KDE-Keywords[ar]": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,بطاقة,dxdiag الرسوميات,تسريع العتاد,الرسوميات",

diff --git a/kcms/glx/main.cpp b/kcms/glx/main.cpp

index a7317411..a6c5621d 100644

--- a/kcms/glx/main.cpp
@@ -181,7 +181,7 @@ index a7317411..a6c5621d 100644 
     CommandOutputContext *outputContext() const

     {

diff --git a/kcms/helpers/dmidecode-helper/helper.cpp b/kcms/helpers/dmidecode-helper/helper.cpp

index 11921934..1160c5f0 100644

index 2c009acd..f6c1c8e5 100644

--- a/kcms/helpers/dmidecode-helper/helper.cpp

+++ b/kcms/helpers/dmidecode-helper/helper.cpp

@@ -20,10 +20,7 @@ auto make_array(Input &&...args) -> std::array<Output, sizeof...(args)> // NB: w
@@ -197,17 +197,18 @@ index 11921934..1160c5f0 100644 
 

 KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args)

diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in

index 9e502d52..f9f26cbd 100644

index d173229d..71815467 100644

--- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in

+++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in

@@ -95,6 +95,6 @@

@@ -95,7 +95,7 @@

         "Name[zh_CN]": "窗口管理器",

         "Name[zh_TW]": "視窗管理員"

     },

-    "TryExec": "@QtBinariesDir@/qdbus",

+    "TryExec": "@qdbus@",

     "X-KDE-KInfoCenter-Category": "graphical_information"

 }

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "dxdiag",

     "X-KDE-Keywords[ar]": "dxdiag",

diff --git a/kcms/kwinsupportinfo/main.cpp b/kcms/kwinsupportinfo/main.cpp

index ddb55b5c..8dc6b668 100644

--- a/kcms/kwinsupportinfo/main.cpp
@@ -222,7 +223,7 @@ index ddb55b5c..8dc6b668 100644 
                                                    parent);

     }

diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json

index 20df9662..6a64c762 100644

index 87ad4a4c..e3f07e81 100644

--- a/kcms/memory/kcm_memory.json

+++ b/kcms/memory/kcm_memory.json

@@ -134,7 +134,7 @@
@@ -235,10 +236,10 @@ index 20df9662..6a64c762 100644 
     "X-KDE-Keywords": "Memory,RAM,dmidecode",

     "X-KDE-Keywords[ar]": "Memory,RAM,dmidecode,رام,ذاكرة,ذاكرة حية",

diff --git a/kcms/network/kcm_network.json b/kcms/network/kcm_network.json

index 5fc677a5..59ec49da 100644

index 4ab2e0f1..559baf6f 100644

--- a/kcms/network/kcm_network.json

+++ b/kcms/network/kcm_network.json

@@ -148,7 +148,7 @@

@@ -146,7 +146,7 @@

         "Name[zh_CN]": "网络接口",

         "Name[zh_TW]": "網路介面"

     },
@@ -248,20 +249,20 @@ index 5fc677a5..59ec49da 100644 
     "X-KDE-Keywords": "network,nic,ip,ip address,mac,inet,eth,wlan,wifi",

     "X-KDE-Keywords[ar]": "network,nic,ip,ip address,mac,inet,eth,wlan,wifi,الشبكة,شبكة الاتصال,عنوان IP,عنوان IP,جهاز Mac,شبكة الإنترنت,شبكة ETH,شبكة WLAN,شبكة Wi-Fi",

diff --git a/kcms/network/main.cpp b/kcms/network/main.cpp

index f02577a3..479e18df 100644

index a49284d3..77818fe2 100644

--- a/kcms/network/main.cpp

+++ b/kcms/network/main.cpp

@@ -18,7 +18,7 @@ public:

     explicit KCMNetwork(QObject *parent, const KPluginMetaData &data)

         : KQuickConfigModule(parent, data)

@@ -24,7 +24,7 @@ public:

     {

-        m_outputContext = new CommandOutputContext(u"ip"_s, {u"address"_s}, parent);

+        m_outputContext = new CommandOutputContext(u"@ip@"_s, {u"address"_s}, parent);

         const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, u"kinfocenter/network/ip.sh"_s, QStandardPaths::LocateFile);

         const QString darkness = QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark ? u"1"_s : u"0"_s;

-        m_outputContext = new CommandOutputContext({u"ip"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent);

+        m_outputContext = new CommandOutputContext({u"@ip@"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent);

     }

     CommandOutputContext *outputContext() const

     {

diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json

index 61706cb9..b7fb9c59 100644

index e63b60a9..93f1f484 100644

--- a/kcms/opencl/kcm_opencl.json

+++ b/kcms/opencl/kcm_opencl.json

@@ -92,7 +92,7 @@
@@ -271,8 +272,8 @@ index 61706cb9..b7fb9c59 100644 
-    "TryExec": "clinfo",

+    "TryExec": "@clinfo@",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "OpenCL,VideoCard,Hardware Acceleration,Graphics",

     "X-KDE-Keywords[ar]": "OpenCL,VideoCard,Hardware Acceleration,Graphics,بطاقة الفيديو,تسريع العتاد,الرسوميات",

     "X-KDE-Keywords": "OpenCL,VideoCard,Hardware Acceleration,Graphics,dxdiag",

     "X-KDE-Keywords[ar]": "OpenCL,VideoCard,Hardware Acceleration,Graphics,بطاقة الفيديو,تسريع العتاد,الرسوميات,dxdiag",

diff --git a/kcms/opencl/main.cpp b/kcms/opencl/main.cpp

index d58728ab..88733d46 100644

--- a/kcms/opencl/main.cpp
@@ -300,10 +301,10 @@ index 36d82ef8..16ce2703 100644 
 endif()

 

diff --git a/kcms/sensors/kcm_sensors.json b/kcms/sensors/kcm_sensors.json

index e1994f2c..e1c27245 100644

index 4f9959dc..1cba9e5f 100644

--- a/kcms/sensors/kcm_sensors.json

+++ b/kcms/sensors/kcm_sensors.json

@@ -58,7 +58,7 @@

@@ -66,7 +66,7 @@

         "Name[zh_CN]": "传感器",

         "Name[zh_TW]": "感測器"

     },
@@ -326,18 +327,18 @@ index 8dae9f8f..ee70f381 100644 
     }

     CommandOutputContext *outputContext() const

diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json

index 9a297a07..2c30b20a 100644

index ca4cf9e0..4f6af805 100644

--- a/kcms/vulkan/kcm_vulkan.json

+++ b/kcms/vulkan/kcm_vulkan.json

@@ -102,7 +102,7 @@

@@ -100,7 +100,7 @@

         "Name[zh_CN]": "Vulkan",

         "Name[zh_TW]": "Vulkan"

     },

-    "TryExec": "vulkaninfo",

+    "TryExec": "@vulkaninfo@",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics",

     "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات",

     "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag",

     "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag",

diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp

index 5665d9d2..008f1bf0 100644

--- a/kcms/vulkan/main.cpp
@@ -352,18 +353,18 @@ index 5665d9d2..008f1bf0 100644 
     CommandOutputContext *outputContext() const

     {

diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json

index 66022b79..1756eb0e 100644

index 7ca1dcb7..e814570b 100644

--- a/kcms/wayland/kcm_wayland.json

+++ b/kcms/wayland/kcm_wayland.json

@@ -108,7 +108,7 @@

@@ -106,7 +106,7 @@

         "Name[zh_CN]": "Wayland",

         "Name[zh_TW]": "Wayland"

     },

-    "TryExec": "wayland-info",

+    "TryExec": "@waylandinfo@",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "Wayland,Compositor,Display,System Information",

     "X-KDE-Keywords[ar]": "ويلاند,مراكب,عرض,معلومات النّظام",

     "X-KDE-Keywords": "Wayland,Compositor,Display,System Information,dxdiag",

     "X-KDE-Keywords[ar]": "ويلاند,مراكب,عرض,معلومات النّظام,dxdiag",

diff --git a/kcms/wayland/main.cpp b/kcms/wayland/main.cpp

index 3a4825c7..4633927b 100644

--- a/kcms/wayland/main.cpp
@@ -378,10 +379,10 @@ index 3a4825c7..4633927b 100644 
     CommandOutputContext *outputContext() const

     {

diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json

index a5e64d94..81190779 100644

index 5b12997a..9debc887 100644

--- a/kcms/xserver/kcm_xserver.json

+++ b/kcms/xserver/kcm_xserver.json

@@ -148,7 +148,7 @@

@@ -146,7 +146,7 @@

         "Name[zh_CN]": "X 服务器",

         "Name[zh_TW]": "X 伺服器"

     },
@@ -389,7 +390,7 @@ index a5e64d94..81190779 100644 
+    "TryExec": "@xdpyinfo@",

     "X-DocPath": "kinfocenter/graphical.html#xserver",

     "X-KDE-KInfoCenter-Category": "graphical_information",

     "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information",

     "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information,dxdiag",

diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp

index df9af24a..e5983e22 100644

--- a/kcms/xserver/main.cpp