sync some changes from -git package

8 files changed, 36 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c49c4d25a289..19b77a05b084 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plymouth
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support
 	pkgver = 0.9.5
-	pkgrel = 6
+	pkgrel = 7
 	url = https://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
 	arch = x86_64
@@ -24,32 +24,28 @@ pkgbase = plymouth
 	source = plymouth.encrypt_install
 	source = lxdm-plymouth.service
 	source = lightdm-plymouth.service
-	source = slim-plymouth.service
 	source = sddm-plymouth.service
 	source = plymouth-deactivate.service
-	source = plymouth-start.service.in.patch
-	source = plymouth-start.path
 	source = plymouth.initcpio_hook
 	source = plymouth.initcpio_install
 	source = sd-plymouth.initcpio_install
 	source = plymouth-quit.service.in.patch
 	source = plymouth-update-initrd.patch
+	source = plymouthd.conf.patch
 	sha256sums = 55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba
 	sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
 	sha256sums = 7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120
 	sha256sums = 373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a
 	sha256sums = 06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d
-	sha256sums = 4b7e47fb8d1e00d8b550c1fa21c193480643dfc40965bc7b925657f720bd189f
-	sha256sums = 9b5534921c5bf92a9285ba53b323209e812145c204ac5fed6899b7aad78300ef
+	sha256sums = 86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71
 	sha256sums = c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba
 	sha256sums = 3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb
-	sha256sums = 3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb
-	sha256sums = ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff
 	sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
 	sha256sums = 2dd996a86beb1dc1fa5e45a14e98daa8fc505c5d1dff94bc5fdb3246a113d5ca
-	sha256sums = 50a32014540c6603910b95ce0e40097089dde11fdde3f502c721b6b160a0b997
-	sha256sums = a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa
+	sha256sums = 4c3e59af4cda996f7615f80a94bbd6339621d998888bcf912a13e8534605608a
+	sha256sums = dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a
 	sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
+	sha256sums = 71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2
 
 pkgname = plymouth
 
diff --git a/PKGBUILD b/PKGBUILD
index 346c8a2053c7..0aa191d54a3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=plymouth
 pkgver=0.9.5
-pkgrel=6
+pkgrel=7
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
 url="https://www.freedesktop.org/wiki/Software/Plymouth/"
 arch=('i686' 'x86_64')
@@ -28,16 +28,16 @@ source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver
        'plymouth.encrypt_install'
        'lxdm-plymouth.service'
        'lightdm-plymouth.service'
-       'slim-plymouth.service'
        'sddm-plymouth.service'
-       'plymouth-deactivate.service'
-       'plymouth-start.service.in.patch'
-       'plymouth-start.path'
+       'plymouth-deactivate.service' # needed for sddm
+#       'plymouth-start.service.in.patch'
+#       'plymouth-start.path'
        'plymouth.initcpio_hook'
        'plymouth.initcpio_install'
        'sd-plymouth.initcpio_install'
        'plymouth-quit.service.in.patch'
        'plymouth-update-initrd.patch'
+       'plymouthd.conf.patch'
 )
 
 sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba'
@@ -45,23 +45,23 @@ sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba'
             '7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120'
             '373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a'
             '06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d'
-            '4b7e47fb8d1e00d8b550c1fa21c193480643dfc40965bc7b925657f720bd189f'
-            '9b5534921c5bf92a9285ba53b323209e812145c204ac5fed6899b7aad78300ef'
+            '86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71'
             'c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba'
             '3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb'
-            '3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb'
-            'ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff'
             '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
             '2dd996a86beb1dc1fa5e45a14e98daa8fc505c5d1dff94bc5fdb3246a113d5ca'
-            '50a32014540c6603910b95ce0e40097089dde11fdde3f502c721b6b160a0b997'
-            'a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa'
-            '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a')
+            '4c3e59af4cda996f7615f80a94bbd6339621d998888bcf912a13e8534605608a'
+            'dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a'
+            '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a'
+            '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2')
 
 prepare() {
 	cd "$srcdir"/${pkgname}-${pkgver}
 	patch -p1 -i $srcdir/plymouth-update-initrd.patch
 	patch -p1 -i $srcdir/plymouth-quit.service.in.patch
-	patch -p1 -i $srcdir/plymouth-start.service.in.patch
+# Does not actually seem needed???	
+#	patch -p1 -i $srcdir/plymouth-start.service.in.patch
+	patch -p1 -i $srcdir/plymouthd.conf.patch
 }
 
 build() {
@@ -105,13 +105,13 @@ package() {
 	install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
 	install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth"
 
-	for i in {sddm,lxdm,slim,lightdm}-plymouth.service; do
+	for i in {sddm,lxdm,lightdm}-plymouth.service; do
 		install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
 	done
 	
 	ln -s "/usr/lib/systemd/system/gdm.service" "$pkgdir/usr/lib/systemd/system/gdm-plymouth.service"
 
 	install -Dm644 "$srcdir/plymouth-deactivate.service" 	"$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
-	install -Dm644 "$srcdir/plymouth-start.path" 	"$pkgdir/usr/lib/systemd/system/plymouth-start.path"
+#	install -Dm644 "$srcdir/plymouth-start.path" 	"$pkgdir/usr/lib/systemd/system/plymouth-start.path"
 	install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
 }
diff --git a/lightdm-plymouth.service b/lightdm-plymouth.service
index c3d4acb926ef..a845498fddf5 100644
--- a/lightdm-plymouth.service
+++ b/lightdm-plymouth.service
@@ -1,8 +1,7 @@
 [Unit]
 Description=Light Display Manager
-Documentation=man:lightdm(1)
 Conflicts=getty@tty1.service plymouth-quit.service
-After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
 
 [Service]
 ExecStart=/usr/bin/lightdm
diff --git a/plymouth-quit.service.in.patch b/plymouth-quit.service.in.patch
index 133834986b6a..cc226e1c6ba1 100644
--- a/plymouth-quit.service.in.patch
+++ b/plymouth-quit.service.in.patch
@@ -8,7 +8,6 @@ diff -aur plymouth.src/systemd-units/plymouth-quit.service.in plymouth.patch/sys
 +Before=getty@tty1.service
  
  [Service]
--ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
-+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash
+ ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
  Type=oneshot
  TimeoutSec=20
diff --git a/plymouth-start.service.in.patch b/plymouth-start.service.in.patch
index b630b61571b1..0f610dee7444 100644
--- a/plymouth-start.service.in.patch
+++ b/plymouth-start.service.in.patch
@@ -1,8 +1,8 @@
---- plymouth.src/systemd-units/Downloads/plymouth-start.service.in
+--- plymouth.src/systemd-units/plymouth-start.service.in
 +++ plymouth.patch/systemd-units/plymouth-start.service.in
 @@ -12,3 +12,6 @@
  RemainAfterExit=yes 
- KillMode=none 
+ KillMode=mixed 
  SendSIGKILL=no
 +
 +[Install]
diff --git a/plymouthd.conf.patch b/plymouthd.conf.patch
new file mode 100644
index 000000000000..da3105178530
--- /dev/null
+++ b/plymouthd.conf.patch
@@ -0,0 +1,10 @@
+--- plymouth.src/src/plymouthd.defaults
++++ plymouth.patch/src/plymouthd.defaults
+@@ -1,5 +1,4 @@
+-# Distribution defaults. Changes to this file will get overwritten during
+-# upgrades.
++# Set your plymouth configuration here.
+ [Daemon]
+ Theme=spinner
+ ShowDelay=0
+
diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install
index 3fe992305a5a..dff0328781ab 100644
--- a/sd-plymouth.initcpio_install
+++ b/sd-plymouth.initcpio_install
@@ -76,6 +76,7 @@ build() {
 		plymouth-read-write.service \
 		plymouth-reboot.service \
 		plymouth-start.service \
+		plymouth-switch-root-initramfs.service \
 		plymouth-switch-root.service
 }
 
diff --git a/slim-plymouth.service b/slim-plymouth.service
deleted file mode 100644
index 6ee9a6b4c837..000000000000
--- a/slim-plymouth.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-Conflicts=getty@tty1.service plymouth-quit.service
-Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-Restart=always
-IgnoreSIGPIPE=no
-StandardOutput=syslog
-
-[Install]
-Alias=display-manager.service