pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch

   1 diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
   2 index f591b9c..e883212 100644
   3 --- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
   4 +++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
   5 @@ -63,6 +63,6 @@
   6          "Name[x-test]": "xxWindow Managerxx",
   7          "Name[zh_CN]": "窗口管理器"
   8      },
   9 -    "TryExec": "@QtBinariesDir@/qdbus",
  10 +    "TryExec": "@qdbus@",
  11      "X-KDE-KInfoCenter-Category": "graphical_information"
  12  }
  13 diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp
  14 index 667c079..b727b67 100644
  15 --- a/Modules/kwinsupportinfo/main.cpp
  16 +++ b/Modules/kwinsupportinfo/main.cpp
  17 @@ -19,7 +19,7 @@ public:
  18      explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
  19          : ConfigModule(parent, data, args)
  20      {
  21 -        auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"),
  22 +        auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"),
  23                                                        {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")},
  24                                                        parent);
  25          qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext);
  26 diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json
  27 index 04acd6b..24b8f36 100644
  28 --- a/Modules/xserver/kcm_xserver.json
  29 +++ b/Modules/xserver/kcm_xserver.json
  30 @@ -130,7 +130,7 @@
  31          "Name[zh_CN]": "X 服务器",
  32          "Name[zh_TW]": "X 伺服器"
  33      },
  34 -    "TryExec": "xdpyinfo",
  35 +    "TryExec": "@xdpyinfo@",
  36      "X-DocPath": "kinfocenter/graphical.html#xserver",
  37      "X-KDE-KInfoCenter-Category": "graphical_information",
  38      "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information",
  39 diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp
  40 index c406ff7..a261b90 100644
  41 --- a/Modules/xserver/main.cpp
  42 +++ b/Modules/xserver/main.cpp
  43 @@ -17,7 +17,7 @@ public:
  44      explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
  45          : ConfigModule(parent, data, args)
  46      {
  47 -        auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent);
  48 +        auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent);
  49          qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext);
  50
  51          auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL);