diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,7 +1,6 @@ libX11.so.6 libXdmcp.so.6 libc.so.6 -libgcc_s.so.1 libgcrypt.so.20 libgio-2.0.so.0 libglib-2.0.so.0 diff --git a/files/lightdm-wrapper b/files/lightdm-wrapper --- a/files/lightdm-wrapper +++ b/files/lightdm-wrapper @@ -1,6 +1,41 @@ -#!/bin/bash +#!/bin/sh +# +# LightDM wrapper to run around X sessions. -source /usr/share/defaults/etc/profile +echo "Running X session wrapper" -exec $* +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file" + . "$file" + fi +done +unset file +# Load resources +if command -v xrdb >/dev/null 2>&1; then + for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do + if [ -f "$file" ]; then + echo "Loading resource: $file" + xrdb -merge "$file" + fi + done + unset file +fi + +# Run all system xinitrc shell scripts +xinitdir="/etc/X11/xinit/xinitrc.d" +if [ -d "$xinitdir" ]; then + for script in $xinitdir/*; do + if [ -x "$script" -a ! -d "$script" ]; then + echo "Loading xinit script $script" + . "$script" + fi + done + unset script +fi + +echo "X session wrapper complete, running session $@" + +exec $@ diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : lightdm version : 1.30.0 -release : 38 +release : 39 source : - https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz : a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95 homepage : https://github.com/CanonicalLtd/lightdm diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ lightdm https://github.com/CanonicalLtd/lightdm - Joshua Strobl - joshua@streambits.io + Longwu Ou + xulongwu4@gmail.com LGPL-3.0-or-later GPL-3.0-or-later @@ -149,7 +149,7 @@ programming.devel - lightdm + lightdm /usr/include/lightdm-gobject-1/lightdm.h @@ -199,12 +199,12 @@ - - 2020-03-12 + + 2020-06-04 1.30.0 Packaging update - Joshua Strobl - joshua@streambits.io + Longwu Ou + xulongwu4@gmail.com \ No newline at end of file