diff options
| author |   Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
| commit | 703149752c6265b36973d2c1f0f5a69721e3128a (patch) | |
| tree | 7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/kde-workspace | |
| parent | dd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff) | |
| parent | cd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff) | |
| download | ktown-703149752c6265b36973d2c1f0f5a69721e3128a.tar.gz ktown-703149752c6265b36973d2c1f0f5a69721e3128a.tar.xz | |
Diffstat (limited to '')
| -rw-r--r-- | kde/patch/kde-workspace.patch | 4 | ||||
| -rw-r--r-- | kde/patch/kde-workspace/kde-workspace.desktopnames.diff | 34 |
2 files changed, 0 insertions, 38 deletions
diff --git a/kde/patch/kde-workspace.patch b/kde/patch/kde-workspace.patch index 4a355d1..bebecfe 100644 --- a/kde/patch/kde-workspace.patch +++ b/kde/patch/kde-workspace.patch @@ -4,9 +4,5 @@ cat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff | patch -p1 - # Always show 'remaining time' in the popup of the battery plasmoid: cat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# Fix crash when DesktopNames isn't set (fixed in 4.11.10): -#cat $CWD/patch/kde-workspace/kde-workspace.desktopnames.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - # In Plasma 5 we do not need the Plasma 4 core apps, they conflict. cat $CWD/patch/kde-workspace/kde-workspace.no.plasma4.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff deleted file mode 100644 index 59aef1c..0000000 --- a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff +++ /dev/null @@ -1,34 +0,0 @@ -commit e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f -Author: David Faure <faure@kde.org> -Date: Fri May 2 10:26:38 2014 +0200 - - Fix crash when DesktopNames isn't set - - BUG: 334159 - FIXED-IN: 4.11.10 - -diff --git a/kdm/backend/client.c b/kdm/backend/client.c -index 335cc3e..a2d06c2 100644 ---- a/kdm/backend/client.c -+++ b/kdm/backend/client.c -@@ -1810,12 +1810,14 @@ startClient(volatile int *pid) - !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0))) - sessargs = ""; - buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0); -- for (buf2 = buf; *buf2; ++buf2) { -- if (*buf2 == ';') -- *buf2 = ':'; -+ if (buf) { -+ for (buf2 = buf; *buf2; ++buf2) { -+ if (*buf2 == ';') -+ *buf2 = ':'; -+ } -+ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf); -+ free(buf); - } -- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf); -- free(buf); - free(str); - free(fname); - goto gotit; - |