diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | plymouth-start.path | 10 | ||||
| -rw-r--r-- | plymouth-start.service.in.patch | 9 | ||||
| -rw-r--r-- | plymouth.initcpio_install | 9 | ||||
| -rw-r--r-- | sd-plymouth.initcpio_install | 9 |
6 files changed, 26 insertions, 46 deletions
@@ -1,7 +1,7 @@ pkgbase = plymouth pkgdesc = A graphical boot splash screen with kernel mode-setting support - pkgver = 0.9.5 - pkgrel = 7 + pkgver = 22.02.122 + pkgrel = 1 url = https://www.freedesktop.org/wiki/Software/Plymouth/ arch = i686 arch = x86_64 @@ -13,12 +13,10 @@ pkgbase = plymouth optdepends = ttf-dejavu: For true type font support optdepends = xf86-video-fbdev: Support special graphic cards on early startup optdepends = cantarell-fonts: True Type support for BGRT theme - conflicts = plymouth-legacy - conflicts = plymouth-nosystemd options = !libtool options = !emptydirs backup = etc/plymouth/plymouthd.conf - source = https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/0.9.5/plymouth-0.9.5.tar.gz + source = https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/22.02.122/plymouth-22.02.122.tar.gz source = arch-logo.png source = plymouth.encrypt_hook source = plymouth.encrypt_install @@ -32,7 +30,7 @@ pkgbase = plymouth source = plymouth-quit.service.in.patch source = plymouth-update-initrd.patch source = plymouthd.conf.patch - sha256sums = 55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba + sha256sums = 8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6 sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7 sha256sums = 748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7 sha256sums = 373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a @@ -41,8 +39,8 @@ pkgbase = plymouth sha256sums = c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba sha256sums = 3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769 - sha256sums = 2dd996a86beb1dc1fa5e45a14e98daa8fc505c5d1dff94bc5fdb3246a113d5ca - sha256sums = 4c3e59af4cda996f7615f80a94bbd6339621d998888bcf912a13e8534605608a + sha256sums = d2201253d9f4a1f7e556e60a04401237273a4577e157a8c4471d5c81bff88ccd + sha256sums = d254f3d01631024ed4563d39fcaa631b0ace097faf7ed05de382859ccfa48a08 sha256sums = dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a sha256sums = 71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2 @@ -5,8 +5,8 @@ # pkgname=plymouth -pkgver=0.9.5 -pkgrel=7 +pkgver=22.02.122 +pkgrel=1 pkgdesc="A graphical boot splash screen with kernel mode-setting support" url="https://www.freedesktop.org/wiki/Software/Plymouth/" arch=('i686' 'x86_64') @@ -17,21 +17,18 @@ makedepends=('docbook-xsl') optdepends=('ttf-dejavu: For true type font support' 'xf86-video-fbdev: Support special graphic cards on early startup' 'cantarell-fonts: True Type support for BGRT theme') -conflicts=('plymouth-legacy' 'plymouth-nosystemd') backup=('etc/plymouth/plymouthd.conf') options=('!libtool' '!emptydirs') source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'arch-logo.png' + 'arch-logo.png' 'plymouth.encrypt_hook' 'plymouth.encrypt_install' 'lxdm-plymouth.service' 'lightdm-plymouth.service' 'sddm-plymouth.service' 'plymouth-deactivate.service' # needed for sddm -# 'plymouth-start.service.in.patch' -# 'plymouth-start.path' 'plymouth.initcpio_hook' 'plymouth.initcpio_install' 'sd-plymouth.initcpio_install' @@ -40,7 +37,7 @@ source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver 'plymouthd.conf.patch' ) -sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba' +sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6' 'de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7' '748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7' '373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a' @@ -49,8 +46,8 @@ sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba' 'c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba' '3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb' '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769' - '2dd996a86beb1dc1fa5e45a14e98daa8fc505c5d1dff94bc5fdb3246a113d5ca' - '4c3e59af4cda996f7615f80a94bbd6339621d998888bcf912a13e8534605608a' + 'd2201253d9f4a1f7e556e60a04401237273a4577e157a8c4471d5c81bff88ccd' + 'd254f3d01631024ed4563d39fcaa631b0ace097faf7ed05de382859ccfa48a08' 'dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a' '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a' '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2') @@ -59,8 +56,6 @@ prepare() { cd "$srcdir"/${pkgname}-${pkgver} patch -p1 -i $srcdir/plymouth-update-initrd.patch patch -p1 -i $srcdir/plymouth-quit.service.in.patch -# Does not actually seem needed??? -# patch -p1 -i $srcdir/plymouth-start.service.in.patch patch -p1 -i $srcdir/plymouthd.conf.patch } @@ -109,10 +104,6 @@ package() { install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i" done -# soft-linking gdm-plymouth is deprecated and no longer necessary -# 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 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" } diff --git a/plymouth-start.path b/plymouth-start.path deleted file mode 100644 index 6a8c957a0958..000000000000 --- a/plymouth-start.path +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Automatically Start Plymouth Boot Screen - -[Path] -PathExistsGlob=/sys/class/graphics/fb*/device/drm/ -Unit=plymouth-start.service - -[Install] -WantedBy=sysinit.target - diff --git a/plymouth-start.service.in.patch b/plymouth-start.service.in.patch deleted file mode 100644 index 0f610dee7444..000000000000 --- a/plymouth-start.service.in.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- plymouth.src/systemd-units/plymouth-start.service.in -+++ plymouth.patch/systemd-units/plymouth-start.service.in -@@ -12,3 +12,6 @@ - RemainAfterExit=yes - KillMode=mixed - SendSIGKILL=no -+ -+[Install] -+WantedBy=sysinit.target diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install index 436734dcce76..2bd0a2ffbe45 100644 --- a/plymouth.initcpio_install +++ b/plymouth.initcpio_install @@ -16,6 +16,7 @@ build() { add_binary /usr/bin/plymouthd add_binary /usr/bin/plymouth + add_binary /usr/lib/plymouth/plymouthd-fd-escrow add_file ${DATADIR}/themes/text/text.plymouth add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so @@ -35,13 +36,17 @@ build() { if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" ]; then add_file "/usr/share/fonts/TTF/DejaVuSans.ttf" - add_file "/etc/fonts/conf.d/57-dejavu-sans.conf" + if [ -f "/etc/fonts/conf.d/57-dejavu-sans.conf" ]; then + add_file "/etc/fonts/conf.d/57-dejavu-sans.conf" + fi fi if [ -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf" add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf" - add_file "/etc/fonts/conf.d/60-latin.conf" + if [ -f "/etc/fonts/conf.d/60-latin.conf" ]; then + add_file "/etc/fonts/conf.d/60-latin.conf" + fi fi if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install index dff0328781ab..9944f8979dd5 100644 --- a/sd-plymouth.initcpio_install +++ b/sd-plymouth.initcpio_install @@ -16,6 +16,7 @@ build() { add_binary /usr/bin/plymouthd add_binary /usr/bin/plymouth + add_binary /usr/lib/plymouth/plymouthd-fd-escrow add_file ${DATADIR}/themes/text/text.plymouth add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so @@ -35,13 +36,17 @@ build() { if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" ]; then add_file "/usr/share/fonts/TTF/DejaVuSans.ttf" - add_file "/etc/fonts/conf.d/57-dejavu-sans.conf" + if [ -f "/etc/fonts/conf.d/57-dejavu-sans.conf" ]; then + add_file "/etc/fonts/conf.d/57-dejavu-sans.conf" + fi fi if [ -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf" add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf" - add_file "/etc/fonts/conf.d/60-latin.conf" + if [ -f "/etc/fonts/conf.d/60-latin.conf" ]; then + add_file "/etc/fonts/conf.d/60-latin.conf" + fi fi if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then |