Merge pull request #14027 from Rmys/master

sddm rebuild

desktop/misc/sddm/actions.py

@@ -37,7 +37,7 @@ def install():
     shelltools.system('sed -i "s@system-local-login@system-login@" ' + get.installDIR() + "/etc/pam.d/sddm-autologin")
 
     # pisitools.insinto("/usr/share/sddm/themes/Sweet-Cat", "../Sweet-Cat-0.1/*")
-    pisitools.insinto("/usr/share/sddm/themes/Pisilinux234V2", "Pisilinux234V2-sddm-themes-1.0/*")
+    pisitools.insinto("/usr/share/sddm/themes/pisilinux24", "sddm-pisilinux24-1.0/*")
     # pisitools.dosym("/usr/bin/sddm-greeter-qt6", "/usr/bin/sddm-greeter")
 
     pisitools.dodoc("LICENSE")

desktop/misc/sddm/files/default.conf

@@ -0,0 +1,152 @@
+[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]
+# Which display server should be used.
+# Valid values are: x11, x11-user, wayland. Wayland support is experimental
+DisplayServer=x11
+
+# Comma-separated list of environment variables to be set
+GreeterEnvironment=
+
+# Halt command
+# HaltCommand=/usr/bin/loginctl poweroff
+HaltCommand=/sbin/shutdown -h -P now
+
+# Input method module
+InputMethod=
+
+# Comma-separated list of Linux namespaces for user session to enter
+Namespaces=
+
+# 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=/usr/bin/loginctl reboot
+RebootCommand=/sbin/shutdown -r now
+
+
+[Theme]
+# Current theme name
+Current=pisilinux24
+
+# Cursor size used in the greeter
+CursorSize=
+
+# Cursor theme used in the greeter
+CursorTheme=
+
+# 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=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+FacesDir=/usr/share/sddm/faces
+
+# Font used in the greeter
+Font=
+
+# Theme directory path
+ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH for logged in users
+# DefaultPath=/usr/local/bin:/usr/bin:/bin
+DefaultPath=/bin:/usr/bin:/sbin:/usr/sbin:/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=
+HideUsers=git,sddm
+
+# Maximum user id for displayed users
+# MaximumUid=60000
+MaximumUid=65000
+
+# 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=true
+
+
+[Wayland]
+# Path of the Wayland compositor to execute when starting the greeter
+CompositorCommand=weston --shell=kiosk
+
+# Enable Qt's automatic high-DPI scaling
+EnableHiDPI=true
+
+# Path to a script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+
+# Comma-separated list of directories containing available Wayland sessions
+SessionDir=/usr/local/share/wayland-sessions,/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
+
+# Minimum VT
+# The lowest virtual terminal number that will be used.
+MinimumVT=7
+
+# Enable Qt's automatic high-DPI scaling
+EnableHiDPI=true
+
+# 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
+
+# Comma-separated list of directories containing available X sessions
+# SessionDir=/usr/local/share/xsessions,/usr/share/xsessions
+SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+SessionLogFile=.local/share/sddm/xorg-session.log
+
+# Path to Xephyr binary
+XephyrPath=/usr/bin/Xephyr
+
+# Xauth path
+XauthPath=/usr/bin/xauth
+
+

desktop/misc/sddm/pspec.xml

@@ -17,7 +17,7 @@
         <!--
         <Archive sha1sum="43bf1ad7b34ba5402d43efb99cbae05d90b1564c" type="targz" target="sddm-0.20.0">https://github.com/sebo28/Sweet-Cat/archive/v0.1.tar.gz</Archive>
         -->
-        <Archive sha1sum="6eefa02b9450bf8e5c3f8a6786679131d35996af" type="targz" target="sddm-0.21.0">https://github.com/erkanisik1/Pisilinux234V2-sddm-themes/archive/refs/tags/v1.0.tar.gz</Archive>
+        <Archive sha1sum="02a7233443f8c8619409f2161b74b92afa087b55" type="targz" target="sddm-0.21.0">https://github.com/erkanisik1/sddm-pisilinux24/archive/refs/tags/v1.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>docutils</Dependency>
             <Dependency>keyutils</Dependency>
@@ -86,7 +86,7 @@
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/usr/lib/sddm/sddm.conf.d/sddm.conf">sddm.conf</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/lib/sddm/sddm.conf.d/sddm.conf">default.conf</AdditionalFile>
             <!--AdditionalFile owner="root" permission="0644" target="/etc/pam.d/sddm">sddm</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/etc/pam.d/sddm-autologin">sddm-autologin</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/etc/pam.d/sddm-greeter">sddm-greeter</AdditionalFile-->
@@ -99,6 +99,13 @@
     </Package>
 
     <History>
+        <Update release="29">
+            <Date>2024-05-03</Date>
+            <Version>0.21.0</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="28">
             <Date>2024-03-29</Date>
             <Version>0.21.0</Version>