From 1e2b70eb9ad995e99d86e49d96104c090a860709 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 5 Nov 2020 20:40:51 +0000 Subject: Thu Nov 5 20:40:51 UTC 2020 a/hwdata-0.341-noarch-1.txz: Upgraded. a/kernel-generic-5.4.75-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.75-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.75-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.75-x86-1.txz: Upgraded. k/kernel-source-5.4.75-noarch-1.txz: Upgraded. l/oniguruma-6.9.6-x86_64-1.txz: Upgraded. l/openal-soft-1.21.0-x86_64-1.txz: Upgraded. n/ca-certificates-20201105-noarch-1.txz: Upgraded. This update provides the latest CA certificates to check for the authenticity of SSL connections. x/libwacom-1.6-x86_64-1.txz: Upgraded. x/xkbcomp-1.4.4-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/vtown/kde/sddm-0.18.1-x86_64-1_vtown_3.txz: Rebuilt. Fixed man page installation directory. Thanks to chrisretusn. Xsetup: include comments. Create /var/lib/sddm at build time. Generate /etc/sddm.conf at build time. Do not mess with users/groups in doinst.sh. These are expected to exist. Do not add MinimumVT=7 to sddm.conf, as it is already included by default. usb-and-pxe-installers/usbboot.img: Rebuilt. --- testing/source/vtown/kde/build/sddm | 2 +- .../source/vtown/kde/build/vtown-build-number/sddm | 2 +- testing/source/vtown/kde/cmake/sddm | 2 +- testing/source/vtown/kde/doinst.sh/sddm | 72 +--------------------- .../vtown/kde/post-install/sddm.post-install | 22 +++++-- 5 files changed, 21 insertions(+), 79 deletions(-) (limited to 'testing/source/vtown') diff --git a/testing/source/vtown/kde/build/sddm b/testing/source/vtown/kde/build/sddm index 103dcff6f..951e7a5b2 100644 --- a/testing/source/vtown/kde/build/sddm +++ b/testing/source/vtown/kde/build/sddm @@ -1 +1 @@ -1_vtown_2 +1_vtown_3 diff --git a/testing/source/vtown/kde/build/vtown-build-number/sddm b/testing/source/vtown/kde/build/vtown-build-number/sddm index 0cfbf0888..00750edc0 100644 --- a/testing/source/vtown/kde/build/vtown-build-number/sddm +++ b/testing/source/vtown/kde/build/vtown-build-number/sddm @@ -1 +1 @@ -2 +3 diff --git a/testing/source/vtown/kde/cmake/sddm b/testing/source/vtown/kde/cmake/sddm index c8979fc45..8add3a98b 100644 --- a/testing/source/vtown/kde/cmake/sddm +++ b/testing/source/vtown/kde/cmake/sddm @@ -24,7 +24,7 @@ cd cmake-build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_FULL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_MAN_PAGES:BOOL=TRUE \ -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" \ diff --git a/testing/source/vtown/kde/doinst.sh/sddm b/testing/source/vtown/kde/doinst.sh/sddm index 09a1ccfb3..6571d9b4d 100644 --- a/testing/source/vtown/kde/doinst.sh/sddm +++ b/testing/source/vtown/kde/doinst.sh/sddm @@ -11,79 +11,9 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Create the daemon account and homedirectory otherwise SDDM won't start: -sddmuid=64 -sddmgid=64 -sddmhome=/var/lib/sddm - -if ! chroot . getent group sddm > /dev/null; then - chroot . groupadd -g $sddmgid sddm - res=$? - if [ $res -ne 0 ]; then -cat < /dev/null; then - chroot . useradd -c "SDDM Daemon Owner" -d $sddmhome -u $sddmuid \ - -g sddm -s /bin/false sddm - res=$? - if [ $res -ne 0 ]; then - cat </dev/null - -# Execute this regardless of the pre-existence of the sddm account: -chroot . usermod -d $sddmhome sddm 1>/dev/null -chroot . passwd -l sddm 1>/dev/null -chroot . gpasswd -a sddm video 1>/dev/null - -# Generate a new configuration file if it does not exist: -chroot . sddm --example-config > etc/sddm.conf.new - -if ! grep -q "Current=breeze" etc/sddm.conf.new ; then - # Set the KDE5 theme 'breeze' as default, integrates better with Plasma 5: - sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=breeze/" etc/sddm.conf.new -fi - -if ! grep -q "MinimumVT=7" etc/sddm.conf.new ; then - # SDDM follows the systemd convention of starting the first graphical session - # on tty1. We prefer the old convention where tty1 through tty6 - # are reserved for text consoles: - cat <> etc/sddm.conf.new - -[XDisplay] -MinimumVT=7 -EOT -fi - -# Move over the new confguration file if needed: -if [ -f etc/sddm.conf.new ]; then - config etc/sddm.conf.new -fi -# And our defaults file: +config etc/sddm.conf.new config etc/default/sddm.new - -# Also the session scripts: config usr/share/sddm/scripts/Xsession.new config usr/share/sddm/scripts/Xsetup.new config usr/share/sddm/scripts/Xstop.new config usr/share/sddm/scripts/wayland-session.new - diff --git a/testing/source/vtown/kde/post-install/sddm.post-install b/testing/source/vtown/kde/post-install/sddm.post-install index 6a68a51a4..5f52fede3 100644 --- a/testing/source/vtown/kde/post-install/sddm.post-install +++ b/testing/source/vtown/kde/post-install/sddm.post-install @@ -9,21 +9,34 @@ else done fi +# Create the SDDM home directory: +mkdir -p $PKG/var/lib/sddm +chmod 755 $PKG/var/lib/sddm +chown sddm:sddm $PKG/var/lib/sddm + # Remove the sddm.conf file because we will generate our own in doinst.sh: rm -f $PKG/etc/sddm.conf -# Make sure that Plasma and SDDM work on older GPUs, -# by forcing Qt5 to use software GL rendering: -cat <<"EOGL" >> $PKG/usr/share/sddm/scripts/Xsetup +# Generate the default sddm.conf: +$PKG/usr/bin/sddm --example-config > $PKG/etc/sddm.conf + +# Set the KDE5 theme 'breeze' as default (integrates better with Plasma 5): +sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=breeze/" $PKG/etc/sddm.conf + +# Move the default config file to .new: +mv $PKG/etc/sddm.conf $PKG/etc/sddm.conf.new # Make sure that Plasma and SDDM work on older GPUs, # by forcing Qt5 to use software GL rendering: +cat << "EOF" >> $PKG/usr/share/sddm/scripts/Xsetup +# Make sure that Plasma and SDDM work on older GPUs by forcing Qt5 to use +# software GL rendering if the OpenGL version is not new enough: OPENGL_VERSION=$(LANG=C glxinfo |grep '^OpenGL version string: ' |head -n 1 |sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g') if [ "$OPENGL_VERSION" -lt 2 ]; then QT_XCB_FORCE_SOFTWARE_OPENGL=1 export QT_XCB_FORCE_SOFTWARE_OPENGL fi -EOGL +EOF # Ensure that user customizations to the session files are not lost: mv $PKG/usr/share/sddm/scripts/Xsession{,.new} @@ -46,4 +59,3 @@ chmod 0755 $PKG/usr/bin/sddm # Let's also add an example customization (localization of the UI): mkdir -p $PKG/etc/default echo ". /etc/profile.d/lang.sh" > $PKG/etc/default/sddm.new - -- cgit v1.2.3