Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (40209f441ba8898f24e83831091cd1d44555366c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (40209f441ba8898f24e83831091cd1d44555366c)
  • Date: Sat, 28 Dec 2024 18:19:28 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5-cmake/sddm/BUILD | 2 ++
qt5-cmake/sddm/DEPENDS | 36 +++++++++++++++++++++++++++---------
qt5-cmake/sddm/DETAILS | 8 ++++----
qt5-cmake/sddm/FINAL | 2 +-
qt5-cmake/sddm/HISTORY | 7 +++++++
qt5-cmake/sddm/INSTALL | 10 +++++++---
qt5-cmake/sddm/PRE_BUILD | 3 +++
qt5-cmake/sddm/init.d/sddm | 19 +++++++++++++++----
qt5-cmake/sddm/pam/sddm | 1 +
qt5-cmake/sddm/pam/sddm-autologin | 12 ++++++++++++
qt5-cmake/sddm/pam/sddm-greeter | 7 +++++++
qt5-cmake/sddm/sddm.conf | 24 ++++++++++++++++++------
12 files changed, 104 insertions(+), 27 deletions(-)

New commits:
commit 40209f441ba8898f24e83831091cd1d44555366c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sddm - improvements

commit d2ad371a5e3844f0cf9d25ee76044a052dead348
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sddm: => 0.21.0

diff --git a/qt5-cmake/sddm/BUILD b/qt5-cmake/sddm/BUILD
new file mode 100755
index 0000000..774e28a
--- /dev/null
+++ b/qt5-cmake/sddm/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" -DCMAKE_UNITY_BUILD=true" &&
+default_build
diff --git a/qt5-cmake/sddm/DEPENDS b/qt5-cmake/sddm/DEPENDS
index 8c3d93e..815ca97 100755
--- a/qt5-cmake/sddm/DEPENDS
+++ b/qt5-cmake/sddm/DEPENDS
@@ -1,14 +1,32 @@
-source $GRIMOIRE/QT5_DEPENDS &&
-if [[ "${SDDM_BRANCH}" == "scm" ]]; then
- depends git
+source $GRIMOIRE/QT_DEPENDS &&
+source $GRIMOIRE/depends_one_of.function &&
+
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative -DBUILD_WITH_QT6=on &&
+ depends qt5compat &&
+ depends qt6tools
+else
+ depends qtdeclarative &&
+ depends qttools
fi &&
-depends qtdeclarative &&
-depends qttools &&
+depends linux-pam &&
+depends libxau &&
depends libxcb &&
+depends libxkbcommon &&
optional_depends elogind ' -DUSE_ELOGIND=1' '' 'session tracker' &&
optional_depends systemd '' ' -DNO_SYSTEMD=1' ' session tracker' &&
-optional_depends linux-pam ' -DENABLE_PAM=1' ' -DENABLE_PAM=0' 'PAM support'
&&
optional_depends docutils ' -DBUILD_MAN_PAGES=1' '' 'build man pages' &&
-suggest_depends upower '' '' 'power management' &&
-suggest_depends qtquickcontrols2 '' '' 'style theme configuration' &&
-suggest_depends qtvirtualkeyboard '' '' 'on-screen keyboard'
+optional_depends wayland '' '' 'run greeter with wayland' &&
+if is_depends_enabled $SPELL wayland;then
+ depends_one_of QTG_COMPOSITOR \
+ labwc '' \
+ sway '' \
+ wayfire '' \
+ weston '' \
+ 'wayland compositor'
+
+fi &&
+optional_depends consolekit2 '' '' 'session managemnt' &&
+runtime_depends xrdb &&
+
+suggest_depends upower '' '' 'power management'
diff --git a/qt5-cmake/sddm/DETAILS b/qt5-cmake/sddm/DETAILS
index 5df2133..bf44cac 100755
--- a/qt5-cmake/sddm/DETAILS
+++ b/qt5-cmake/sddm/DETAILS
@@ -8,13 +8,13 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.19.0
-
SOURCE_HASH=sha512:0a40816bc105a1e930fec2d65fabff0ae7e27c641235d90e41f6fbaa86af4bb774a9e30f7548ce2c6c791e6d4f8195b02afddedca60a9e7c77447702e728edc3
+ VERSION=0.21.0
+
SOURCE_HASH=sha512:2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458
SECURITY_PATCH=1
- SOURCE=sddm-$VERSION.tar.xz
+ SOURCE=sddm-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/sddm/sddm
- SOURCE_URL=$WEB_SITE/releases/download/v$VERSION/$SOURCE
+ SOURCE_URL=$WEB_SITE/archive/refs/tags/v$VERSION.tar.gz
fi
ENTERED=20140505
LICENSE[0]=GPL
diff --git a/qt5-cmake/sddm/FINAL b/qt5-cmake/sddm/FINAL
index 8e3f6f0..2e925c0 100755
--- a/qt5-cmake/sddm/FINAL
+++ b/qt5-cmake/sddm/FINAL
@@ -1,5 +1,5 @@
default_final &&
# create a home direcctory for sddm user
-TGT=$INSTALL_ROOT/var/lib/sddm &&
+TGT=$TRACK_ROOT/var/lib/sddm &&
mkdir -p $TGT &&
chown sddm:sddm $TGT
diff --git a/qt5-cmake/sddm/HISTORY b/qt5-cmake/sddm/HISTORY
index 6249ad5..c91d4d1 100644
--- a/qt5-cmake/sddm/HISTORY
+++ b/qt5-cmake/sddm/HISTORY
@@ -1,3 +1,10 @@
+2024-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.21
+ * DEPENDS: allow choice of compositor, pam required
+ * INSTALL: install pam files
+ * pam/* sddm.conf updated
+ * *: qt6 support, wayland support
+
2023-02-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: fix typo

diff --git a/qt5-cmake/sddm/INSTALL b/qt5-cmake/sddm/INSTALL
index 7997968..7aa39ec 100755
--- a/qt5-cmake/sddm/INSTALL
+++ b/qt5-cmake/sddm/INSTALL
@@ -1,4 +1,8 @@
default_install &&
-install -m 0660 -o root -g sddm $SPELL_DIRECTORY/sddm.conf \
- $INSTALL_ROOT/etc/sddm.conf
-
+install -m 0660 -o root -g sddm $SOURCE_DIRECTORY/sddm.conf \
+ $INSTALL_ROOT/etc/sddm.conf &&
+# install pam scripts
+cd $SPELL_DIRECTORY/pam &&
+for SC in `ls`;do
+ install_config_file $SC $INSTALL_ROOT/etc/pam.d/$SC
+done
diff --git a/qt5-cmake/sddm/PRE_BUILD b/qt5-cmake/sddm/PRE_BUILD
index 351cea5..af34894 100755
--- a/qt5-cmake/sddm/PRE_BUILD
+++ b/qt5-cmake/sddm/PRE_BUILD
@@ -5,4 +5,7 @@ if `! grep ^video:.*sddm /etc/group > /dev/null`;then
sed -i '/video:/s/$/,sddm/' /etc/group
fi &&
# sddm wants home directory = /var/lib/sddm
+#/usr/sbin/usermod --home /var/lib/sddm sddm &&
default_pre_build
+# configure sddm.conf for selected compositor
+sed "/$QTG_COMPOSITOR/s/^#//" $SPELL_DIRECTORY/sddm.conf >
$SOURCE_DIRECTORY/sddm.conf
diff --git a/qt5-cmake/sddm/init.d/sddm b/qt5-cmake/sddm/init.d/sddm
index 7f0a501..51d71c9 100755
--- a/qt5-cmake/sddm/init.d/sddm
+++ b/qt5-cmake/sddm/init.d/sddm
@@ -1,23 +1,34 @@
#!/bin/bash

PROGRAM=/usr/bin/sddm
-SDDM=sddm-helper
RUNLEVEL=5
PROVIDES=display_manager
-NEEDS="smgl-messagebus"
-mkdir -p /var/run/sddm
+NEEDS="smgl-messagebus seatd"

. /etc/init.d/smgl_init

+
case $1 in
start)
+# ensure that TMPX exists
+echo "creating $TMPX"
+TMPX=/tmp/.X11-unix
+mkdir -p -ma=rwxt $TMPX
+
+#set permissions for tty
+#for TT in [0-9];do
+# chgrp video /dev/tty$TT
+# chmod g+rw /dev/tty$TT
+#done
+
+export XDG_VTNR=7
echo "Starting Display Manager"
$PROGRAM &
evaluate_retval
;;
stop)
echo "Stopping Display Manager"
- /usr/bin/pkill $SDDM
+ /usr/bin/pkill -9 sddm*
evaluate_retval
;;

diff --git a/qt5-cmake/sddm/pam/sddm b/qt5-cmake/sddm/pam/sddm
new file mode 120000
index 0000000..8271382
--- /dev/null
+++ b/qt5-cmake/sddm/pam/sddm
@@ -0,0 +1 @@
+/etc/pam.d/login
\ No newline at end of file
diff --git a/qt5-cmake/sddm/pam/sddm-autologin
b/qt5-cmake/sddm/pam/sddm-autologin
new file mode 100644
index 0000000..89a7339
--- /dev/null
+++ b/qt5-cmake/sddm/pam/sddm-autologin
@@ -0,0 +1,12 @@
+auth requisite pam_nologin.so
+auth required pam_env.so
+
+auth required pam_succeed_if.so uid >= 1000 quiet
+auth required pam_permit.so
+
+account include system-account
+
+password required pam_deny.so
+
+session required pam_limits.so
+session include system-session
diff --git a/qt5-cmake/sddm/pam/sddm-greeter b/qt5-cmake/sddm/pam/sddm-greeter
new file mode 100644
index 0000000..dab9c40
--- /dev/null
+++ b/qt5-cmake/sddm/pam/sddm-greeter
@@ -0,0 +1,7 @@
+auth required pam_env.so
+auth required pam_permit.so
+
+account required pam_permit.so
+password required pam_deny.so
+session required pam_unix.so
+-session optional pam_systemd.so
diff --git a/qt5-cmake/sddm/sddm.conf b/qt5-cmake/sddm/sddm.conf
index ac6bead..28fbf1b 100644
--- a/qt5-cmake/sddm/sddm.conf
+++ b/qt5-cmake/sddm/sddm.conf
@@ -1,14 +1,26 @@
[General]
AutoRelogin=false
AutoUser=
-HaltCommand='/sbin/halt'
-RebootCommand='/sbin/reboot'
+DisplayServer=wayland
+#DisplayServer=x11
+#DisplayServer=x11-user
+Numlock=on
+
[Theme]
+#Current=elarun
Current=maldives
+#Current=maya
+#Current=breeze
CursorTheme=
-[X11]
-ServerPath=/usr/bin/Xorg
-SessionDir=/usr/share/xsessions
+
[Wayland]
+# Path of the Wayland compositor to execute when starting the greeter
+
+#CompositorCommand="/usr/bin/labwc"
+#CompositorCommand="/usr/bin/sway"
+#CompositorCommand="/usr/bin/wayfire"
+#CompositorCommand=weston --shell=kiosk
+
+[X11]
+# Path to X server binary
ServerPath=/usr/bin/Xwayland
-SessionDir=/usr/share/wayland-sessions


  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (40209f441ba8898f24e83831091cd1d44555366c), Treeve Jelbert, 12/28/2024

Archive powered by MHonArc 2.6.24.

Top of Page