From aff08d2b6dd83b6fa2cd498de5fb6328bd0b6b7e Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Thu, 10 Dec 2020 20:05:42 +0100 Subject: system/sddm: Removed (added to Slackware). Signed-off-by: Matteo Bernardini --- system/sddm/README | 24 -------- system/sddm/consolekit.patch | 12 ---- system/sddm/doinst.sh | 26 --------- system/sddm/sddm.SlackBuild | 122 ---------------------------------------- system/sddm/sddm.conf.new | 129 ------------------------------------------- system/sddm/sddm.info | 10 ---- system/sddm/slack-desc | 19 ------- system/sddm/xsession.patch | 25 --------- 8 files changed, 367 deletions(-) delete mode 100644 system/sddm/README delete mode 100644 system/sddm/consolekit.patch delete mode 100644 system/sddm/doinst.sh delete mode 100644 system/sddm/sddm.SlackBuild delete mode 100644 system/sddm/sddm.conf.new delete mode 100644 system/sddm/sddm.info delete mode 100644 system/sddm/slack-desc delete mode 100644 system/sddm/xsession.patch (limited to 'system') diff --git a/system/sddm/README b/system/sddm/README deleted file mode 100644 index 48efe82f7581..000000000000 --- a/system/sddm/README +++ /dev/null @@ -1,24 +0,0 @@ -SDDM is a modern display manager for X11 and Wayland aiming to be -fast, simple and beautiful. It uses modern technologies like QtQuick, -which in turn gives the designer the ability to create smooth, -animated user interfaces. - -You will need to edit /etc/rc.d/rc.4 to get this work. -Put the section that refers to sddm before the sections for xdm, kdm -etc: - -# Look for SDDM as well: -if [ -x /usr/bin/sddm ]; then - exec /usr/bin/sddm -fi - -Note: The home for SDDM is set by default in /etc/passwd as -/var/empty. This ought to be changed to /var/lib/sddm. To do this, -run: - -usermod -d /var/lib/sddm sddm - -when SDDM is *not* running. Do this before installing or upgrading the -package. - -Note that this is fixed in -current. diff --git a/system/sddm/consolekit.patch b/system/sddm/consolekit.patch deleted file mode 100644 index 2d0cc2093815..000000000000 --- a/system/sddm/consolekit.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -60,7 +60,7 @@ - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { - qDebug() << "Console kit interface found"; -- available = true; -+ available = false; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind - diff --git a/system/sddm/doinst.sh b/system/sddm/doinst.sh deleted file mode 100644 index 873f5495c0ed..000000000000 --- a/system/sddm/doinst.sh +++ /dev/null @@ -1,26 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/sddm.conf.new - -if [ -n "$(grep sddm etc/passwd | grep var/empty)" ]; then - echo "*NOTICE*" - echo - echo 'SDDM $HOME is set to /var/empty in /etc/passwd' - echo "This needs to be changed to /var/lib/sddm" - echo "(see README)." - echo - echo "Please run:" - echo "usermod -d /var/lib/sddm sddm" - echo -fi diff --git a/system/sddm/sddm.SlackBuild b/system/sddm/sddm.SlackBuild deleted file mode 100644 index a977bd5c304c..000000000000 --- a/system/sddm/sddm.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -# Slackware build script for sddm -# Copyright 2017 David Woodfall -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=sddm -VERSION=${VERSION:-0.18.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -SDDM_HOME="/var/lib/sddm" -PW_HOME="$( getent passwd sddm | cut -d: -f6 )" -if [ "$PW_HOME" != "$SDDM_HOME" ]; then - cat < /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - ChangeLog INSTALL.md LICENSE.CC-BY-3.0 LICENSE README.md docs *.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/$SDDM_HOME -chown sddm:sddm $PKG/$SDDM_HOME - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/sddm/sddm.conf.new b/system/sddm/sddm.conf.new deleted file mode 100644 index b5b4e205e5b2..000000000000 --- a/system/sddm/sddm.conf.new +++ /dev/null @@ -1,129 +0,0 @@ -[Autologin] -# Whether sddm should automatically log back into sessions when they exit -Relogin=false - -# Name of session file for autologin session (if empty try last logged in) -Session= - -# Username for autologin session -User= - - -[General] -# Halt command -HaltCommand=/sbin/shutdown -h -P now - -# Input method module -InputMethod= - -# Initial NumLock state. Can be on, off or none. -# If property is set to none, numlock won't be changed -# NOTE: Currently ignored if autologin is enabled. -Numlock=on - -# Reboot command -RebootCommand=/sbin/shutdown -r now - - -[Theme] -# Current theme name -Current=maya - -# Cursor theme used in the greeter -CursorTheme=Oxygen_White - -# Number of users to use as threshold -# above which avatars are disabled -# unless explicitly enabled with EnableAvatars -DisableAvatarsThreshold=7 - -# Enable display of custom user avatars -EnableAvatars= - -# Global directory for user avatars -# The files should be named .face.icon -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - - -[Users] -# Default $PATH for logged in users -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Comma-separated list of shells. -# Users with these shells as their default won't be listed -HideShells= - -# Comma-separated list of users that should not be listed -HideUsers= - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=1000 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - -# When logging in as the same user twice, restore the original session, rather than create a new one -ReuseSession=false - - -[Wayland] -# Enable Qt's automatic high-DPI scaling -EnableHiDPI=false - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Directory containing available Wayland sessions -SessionDir=/usr/share/wayland-sessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/wayland-session.log - - -[X11] -# Path to a script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Path to a script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# Enable Qt's automatic high-DPI scaling -EnableHiDPI=false - -# The lowest virtual terminal number that will be used. -MinimumVT=7 - -# Arguments passed to the X server invocation -ServerArguments=-nolisten tcp - -# Path to X server binary -ServerPath=/usr/bin/X - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Directory containing available X sessions -SessionDir=/usr/share/xsessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/xorg-session.log - -# Path to the Xauthority file -UserAuthFile=.Xauthority - -# Path to xauth binary -XauthPath=/usr/bin/xauth - -# Path to Xephyr binary -XephyrPath=/usr/bin/Xephyr - - diff --git a/system/sddm/sddm.info b/system/sddm/sddm.info deleted file mode 100644 index 6b38805b07f9..000000000000 --- a/system/sddm/sddm.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sddm" -VERSION="0.18.1" -HOMEPAGE="https://github.com/sddm/sddm" -DOWNLOAD="https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz" -MD5SUM="c1ca638a3faf76c526df3049cbc9668a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="extra-cmake-modules qt5" -MAINTAINER="Dave Woodfall" -EMAIL="dave@slackbuilds.org" diff --git a/system/sddm/slack-desc b/system/sddm/slack-desc deleted file mode 100644 index 63b806041951..000000000000 --- a/system/sddm/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sddm: sddm (QML based X11 and Wayland display manager) -sddm: -sddm: SDDM is a modern display manager for X11 and Wayland aiming to be -sddm: fast, simple and beautiful. It uses modern technologies like QtQuick, -sddm: which in turn gives the designer the ability to create smooth, -sddm: animated user interfaces. -sddm: -sddm: https://github.com/sddm/sddm -sddm: -sddm: -sddm: diff --git a/system/sddm/xsession.patch b/system/sddm/xsession.patch deleted file mode 100644 index 457ba85ed060..000000000000 --- a/system/sddm/xsession.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur a/data/scripts/Xsession b/data/scripts/Xsession ---- a/data/scripts/Xsession 2018-07-18 11:31:40.000000000 +0100 -+++ b/data/scripts/Xsession 2018-08-07 20:06:16.937412206 +0100 -@@ -68,6 +68,7 @@ - # by the scripts to work - xsessionddir="/etc/X11/Xsession.d" - OPTIONFILE=/etc/X11/Xsession.options -+# This seems to break with some WMs - USERXSESSION=$HOME/.xsession - USERXSESSIONRC=$HOME/.xsessionrc - ALTUSERXSESSION=$HOME/.Xsession -@@ -91,9 +92,10 @@ - fi - [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources - --if [ -f "$USERXSESSION" ]; then -- . "$USERXSESSION" --fi -+# This seems to break with some WMs -+#if [ -f "$USERXSESSION" ]; then -+# . "$USERXSESSION" -+#fi - - if [ -z "$*" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." -- cgit v1.2.3