Commit 7cbcaefe authored by Chaoting Liu's avatar Chaoting Liu

sddm: tune location and default conf, no build

- install upstream default conf to /usr/lib/sddm/sddm.conf.d
- change our default to use breeze cursor theme
- multiple patches observes from Arch
parent 2b980130
...@@ -17,7 +17,7 @@ backup=('usr/share/sddm/scripts/Xsetup' ...@@ -17,7 +17,7 @@ backup=('usr/share/sddm/scripts/Xsetup'
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
'sddm.conf' 'sddm.sysusers' 'sddm.tmpfiles') 'sddm.conf' 'sddm.sysusers' 'sddm.tmpfiles')
md5sums=('622e825b6b403d165902a5c12163094c' md5sums=('622e825b6b403d165902a5c12163094c'
'7375f6c4e0be2336b31eec2bec820048' '4c33d11ed7ba1c4069ec445d26947636'
'36a0440ca3eb8a527a03d7475a6cefd9' '36a0440ca3eb8a527a03d7475a6cefd9'
'098f2a934ecf9c048b6a9d4b6c41ff5c') '098f2a934ecf9c048b6a9d4b6c41ff5c')
...@@ -42,7 +42,17 @@ package() { ...@@ -42,7 +42,17 @@ package() {
cd build cd build
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
# set the default configuration, with heritage as theme # configuration handling
# Move sddm.conf to /usr/lib https://bugs.archlinux.org/task/56609
install -dm755 "$pkgdir"/usr/lib/sddm/sddm.conf.d/
mv "$pkgdir"/{etc/sddm.conf,usr/lib/sddm/sddm.conf.d}
# Don't set PATH in sddm.conf
sed -r 's|DefaultPath=.*|DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin|g' -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/sddm.conf
# Unset InputMethod https://github.com/sddm/sddm/issues/952
sed -e "/^InputMethod/s/qtvirtualkeyboard//" -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/sddm.conf
# Install Chakra default settings
install -m 644 -p ${srcdir}/sddm.conf ${pkgdir}/etc/ install -m 644 -p ${srcdir}/sddm.conf ${pkgdir}/etc/
# create sddm system user and directory # create sddm system user and directory
......
...@@ -30,7 +30,7 @@ RebootCommand=/usr/bin/systemctl reboot ...@@ -30,7 +30,7 @@ RebootCommand=/usr/bin/systemctl reboot
Current=heritage Current=heritage
# Cursor theme used in the greeter # Cursor theme used in the greeter
CursorTheme=breeze CursorTheme=breeze_cursors
# Number of users to use as threshold # Number of users to use as threshold
# above which avatars are disabled # above which avatars are disabled
...@@ -49,7 +49,7 @@ ThemeDir=/usr/share/sddm/themes ...@@ -49,7 +49,7 @@ ThemeDir=/usr/share/sddm/themes
[Users] [Users]
# Default $PATH for logged in users # Default $PATH for logged in users
DefaultPath=/bin:/usr/bin:/usr/sbin:/usr/local/bin DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin
# Comma-separated list of shells. # Comma-separated list of shells.
# Users with these shells as their default won't be listed # Users with these shells as their default won't be listed
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment