Commit 45cd7d5a authored by K900's avatar K900
Browse files

kdePackages: Frameworks 6.3.0 -> 6.4.0

parent 16007071
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
{
  mkKdeDerivation,
  qtdeclarative,
  libical,
}:
mkKdeDerivation {
  pname = "kcalendarcore";

  extraBuildInputs = [libical];
  extraBuildInputs = [qtdeclarative libical];
}
+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ mkKdeDerivation {
  patches = [
    # Remove hardcoded smbd search path
    ./0001-Remove-impure-smbd-search-path.patch
    # When running a process through systemd, resolve the full path ourselves
    ./early-resolve-executables.diff
    # FIXME(later): discuss with upstream?
  ];

  extraBuildInputs = [qt5compat qttools acl attr];
+0 −13
Original line number Diff line number Diff line
diff --git a/src/gui/systemd/systemdprocessrunner.cpp b/src/gui/systemd/systemdprocessrunner.cpp
index afe3e2c69..5e5ee012d 100644
--- a/src/gui/systemd/systemdprocessrunner.cpp
+++ b/src/gui/systemd/systemdprocessrunner.cpp
@@ -128,7 +128,7 @@ void SystemdProcessRunner::startProcess()
                                               // so we can be notified (see https://github.com/systemd/systemd/pull/3984)
             {QStringLiteral("Environment"), m_process->environment()},
             {QStringLiteral("WorkingDirectory"), m_process->workingDirectory()},
-            {QStringLiteral("ExecStart"), QVariant::fromValue(ExecCommandList{{m_process->program().first(), m_process->program(), false}})},
+            {QStringLiteral("ExecStart"), QVariant::fromValue(ExecCommandList{{QStandardPaths::findExecutable(m_process->program().first()), m_process->program(), false}})},
         },
         {} // aux is currently unused and should be passed as empty array.
     );
+0 −10
Original line number Diff line number Diff line
@@ -2,19 +2,9 @@
  mkKdeDerivation,
  qtdeclarative,
  qtsvg,
  fetchpatch,
}:
mkKdeDerivation {
  pname = "ksvg";

  patches = [
    # Backport patch for SVG rendering glitches with fractional scale
    # FIXME: remove in 6.4
    (fetchpatch {
      url = "https://invent.kde.org/frameworks/ksvg/-/commit/74f9f9cbd226407f8cde08c5cd5a711444e2775d.patch";
      hash = "sha256-i4Wcvo0CkpN2qdlTesnzUyd0mzG1VKbycP5Pd1rHPVg=";
    })
  ];

  extraBuildInputs = [qtdeclarative qtsvg];
}
+216 −216

File changed.

Preview size limit exceeded, changes collapsed.