5 files changed, 21 insertions, 79 deletions
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 <<EOT
-A group with GID $sddmgid already exists!
-You'll have add a 'sddm' group manually.  Run this command (as root):
-  groupadd -g GID sddm
-and select a free value for GID that is below 500 (check /etc/group)"
-Then, run an "upgradepkg --reinstall" of this sddm-qt5 package so that it can run the rest of the install script.
-EOT
-  fi
-fi
-if ! chroot . getent passwd sddm > /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 <<EOT
-Could not create 'sddm' user account.
-Does an account with UID $sddmuid already exist?
-You'll have add a 'sddm' user manually.  Run these commands (as root):
-  useradd -c "SDDM Daemon Owner" -d $sddmhome -u UID -g sddm -s /bin/false sddm
-  passwd -l sddm
-and select a free value for UID that is below 500 (check /etc/passwd)
-Then, run an "upgradepkg --reinstall" of this sddm-qt5 package so that it can run the rest of the install script.
-EOT
-  fi
-fi
-
-# Without a homedirectory, sddm will not start:
-chroot . mkdir -p $sddmhome
-chroot . chown -R ${sddmuid}:${sddmgid} $sddmhome 1>/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 <<EOT >> 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
-