Page MenuHomeSolus
Files F11036251

D8984.id21625.diff
No OneTemporary
Actions

D8984.id21625.diff
View Options

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,74 @@
-#!/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
+
+# Load keymaps
+if command -v setxkbmap >/dev/null 2>&1; then
+ for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading keymap: $file"
+ setxkbmap `cat "$file"`
+ XKB_IN_USE=yes
+ fi
+ done
+ unset file
+fi
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ] && command -v xmodmap >/dev/null 2>&1; then
+ for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading modmap: $file"
+ xmodmap "$file"
+ fi
+ done
+ unset file
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+ for script in $xinitdir/*; do
+ echo "Loading xinit script $script"
+ if [ -x "$script" -a ! -d "$script" ]; then
+ . "$script"
+ fi
+ done
+ unset script
+fi
+
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+ echo "Loading xsession script $script"
+ . "$script"
+fi
+unset script
+
+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 @@
<Name>lightdm</Name>
<Homepage>https://github.com/CanonicalLtd/lightdm</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Longwu Ou</Name>
+ <Email>xulongwu4@gmail.com</Email>
</Packager>
<License>LGPL-3.0-or-later</License>
<License>GPL-3.0-or-later</License>
@@ -149,7 +149,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="38">lightdm</Dependency>
+ <Dependency release="39">lightdm</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/lightdm-gobject-1/lightdm.h</Path>
@@ -199,12 +199,12 @@
</Files>
</Package>
<History>
- <Update release="38">
- <Date>2020-03-12</Date>
+ <Update release="39">
+ <Date>2020-06-03</Date>
<Version>1.30.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Longwu Ou</Name>
+ <Email>xulongwu4@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 7:08 PM (1 d, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5853223
Default Alt Text
D8984.id21625.diff (3 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.