Page MenuHomeSolus

D8315.id20230.diff
No OneTemporary

D8315.id20230.diff

diff --git a/files/0002-Fix-zsh-for-solus.patch b/files/0002-Fix-zsh-for-solus.patch
--- a/files/0002-Fix-zsh-for-solus.patch
+++ b/files/0002-Fix-zsh-for-solus.patch
@@ -1,14 +1,14 @@
-From 991c9f733e654376616f8907017db8d7d713ecb1 Mon Sep 17 00:00:00 2001
-From: "F. von Gellhorn" <flinux@vongellhorn.ch>
-Date: Wed, 12 Feb 2020 18:57:09 +0100
-Subject: [PATCH 1/1] Fix zsh for Solus
+From dceea3f8b880c4eaefdb9647fe7755ac5a658ee5 Mon Sep 17 00:00:00 2001
+From: Troy Harvey <harveydev@protonmail.com>
+Date: Thu, 20 Feb 2020 22:26:39 +1100
+Subject: [PATCH] Fix zsh for solus
---
data/scripts/Xsession | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index c7fa214..072d783 100755
+index c7fa214..658c3a9 100755
--- a/data/scripts/Xsession
+++ b/data/scripts/Xsession
@@ -21,7 +21,7 @@ case $SHELL in
@@ -16,10 +16,10 @@
*/zsh)
[ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
- [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-+ [ -d /etc/zsh ] || [ -d /usr/share/zsh ] && zdir=/etc/zsh || zdir=/etc || zdir=/usr/share/zsh
++ [ -d /usr/share/defaults/etc/zsh ] && zdir=/usr/share/defaults/etc/zsh
zhome=${ZDOTDIR:-$HOME}
# zshenv is always sourced automatically.
[ -f $zdir/zprofile ] && . $zdir/zprofile
--
-2.25.0
+2.25.1
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : sddm
version : 0.18.1
-release : 19
+release : 20
source :
- https://github.com/sddm/sddm/archive/v0.18.1.tar.gz : 07296fc747010a5dd58a45f16c3224b439997afad42566e4b043c841b1b71700
license :
@@ -45,7 +45,7 @@
install -Dm00644 $pkgfiles/sddm.pam $installdir/usr/share/defaults/etc/pam.d/sddm
install -Dm00644 $pkgfiles/sddm-autologin.pam $installdir/usr/share/defaults/etc/pam.d/sddm-autologin
install -Dm00644 $pkgfiles/sddm.conf $installdir/usr/share/sddm/sddm.conf.d/10_solus_default.conf
-
+ rm -rf $installdir/etc
# File provided by linux-driver-management-sddm-integration
rm $installdir/usr/share/sddm/scripts/Xsetup
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>sddm</Name>
<Packager>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Troy Harvey</Name>
+ <Email>harveydev@protonmail.com</Email>
</Packager>
<License>CC-BY-3.0</License>
<License>GPL-2.0-or-later</License>
@@ -20,7 +20,6 @@
</Description>
<PartOf>desktop</PartOf>
<Files>
- <Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin/sddm</Path>
<Path fileType="executable">/usr/bin/sddm-greeter</Path>
<Path fileType="library">/usr/lib64/qt5/qml/SddmComponents/Background.qml</Path>
@@ -227,12 +226,12 @@
</Files>
</Package>
<History>
- <Update release="19">
- <Date>2020-02-13</Date>
+ <Update release="20">
+ <Date>2020-02-25</Date>
<Version>0.18.1</Version>
<Comment>Packaging update</Comment>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Troy Harvey</Name>
+ <Email>harveydev@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 5:47 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5810136
Default Alt Text
D8315.id20230.diff (3 KB)

Event Timeline