diff --git a/files/0002-remove-zsh-from-xsession-for-kf5_5.55.patch b/files/0002-remove-zsh-from-xsession-for-kf5_5.55.patch new file mode 100644 --- /dev/null +++ b/files/0002-remove-zsh-from-xsession-for-kf5_5.55.patch @@ -0,0 +1,46 @@ +From 8597f66e69c3716edee7a95dd9f5a7a538524430 Mon Sep 17 00:00:00 2001 +From: "F. von Gellhorn" +Date: Fri, 22 Feb 2019 14:14:44 +0100 +Subject: [PATCH 1/1] Uncomment the zsh part, somehow this brakes with KF5 + 5.55.0 + +--- + data/scripts/Xsession | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index c7fa214..1f7eeae 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -19,17 +19,17 @@ case $SHELL in + . $HOME/.profile + fi + ;; +-*/zsh) +- [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" +- [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc +- zhome=${ZDOTDIR:-$HOME} +- # zshenv is always sourced automatically. +- [ -f $zdir/zprofile ] && . $zdir/zprofile +- [ -f $zhome/.zprofile ] && . $zhome/.zprofile +- [ -f $zdir/zlogin ] && . $zdir/zlogin +- [ -f $zhome/.zlogin ] && . $zhome/.zlogin +- emulate -R sh +- ;; ++#*/zsh) ++# [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" ++# [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc ++# zhome=${ZDOTDIR:-$HOME} ++# # zshenv is always sourced automatically. ++# [ -f $zdir/zprofile ] && . $zdir/zprofile ++# [ -f $zhome/.zprofile ] && . $zhome/.zprofile ++# [ -f $zdir/zlogin ] && . $zdir/zlogin ++# [ -f $zhome/.zlogin ] && . $zhome/.zlogin ++# emulate -R sh ++# ;; + */csh|*/tcsh) + # [t]cshrc is always sourced automatically. + # Note that sourcing csh.login after .cshrc is non-standard. +-- +2.20.1 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : sddm version : 0.18.0 -release : 15 +release : 16 source : - https://github.com/sddm/sddm/releases/download/v0.18.0/sddm-0.18.0.tar.gz : 9c50b6194f1b4dbf6e1a1b21f23c2c5e384871172985e192b91585986d38eec4 license : @@ -26,6 +26,7 @@ - xkeyboard-config setup : | %patch -p1 < $pkgfiles/0001-Use-Solus-defaults.patch + %patch -p1 < $pkgfiles/0002-remove-zsh-from-xsession-for-kf5_5.55.patch %cmake_ninja -DCMAKE_INSTALL_LIBEXECDIR=%libdir%/%PKGNAME% \ -DSYSTEMD_SYSTEM_UNIT_DIR=%libdir%/systemd/system build : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ sddm - Bryan T. Meyers - bmeyers@datadrake.com + F. von Gellhorn + flinux@vongellhorn.ch CC-BY-3.0 GPL-2.0-or-later @@ -227,12 +227,12 @@ - - 2018-11-09 + + 2019-02-22 0.18.0 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + F. von Gellhorn + flinux@vongellhorn.ch \ No newline at end of file