fix some bugs related to missing fonts & properly deal with image_dir mismatches

author: Taijian 2020-08-08 23:58:38 +0200
committer: Taijian 2020-08-08 23:58:38 +0200
commit: ef6df38a795f83597545acb16f16e970cfe5ccda (patch)
tree: 1eca7cc1c4d52aa3604c758363e3517817669e68
parent: 93d6ef60fa3779e02ffcc1f13157261374e05a82 (diff)
download: aur-ef6df38a795f83597545acb16f16e970cfe5ccda.tar.gz
5 files changed, 56 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 60996112f6be..458684334db6 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 = 1
+	pkgrel = 2
 	url = https://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
 	arch = x86_64
@@ -38,7 +38,7 @@ pkgbase = plymouth
 	sha256sums = 55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba
 	sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
 	sha256sums = 7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120
-	sha256sums = b6193aefa4af4449a700bca25565ba13932ceaaf6ecd72ce1ff107f6c3466ad9
+	sha256sums = 373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a
 	sha256sums = 0fabb974c1a301da000d5c4b9eea224ba508e577d3a6a798b67b94d4d54af255
 	sha256sums = 06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d
 	sha256sums = 86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71
@@ -48,8 +48,8 @@ pkgbase = plymouth
 	sha256sums = 3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb
 	sha256sums = ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff
 	sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
-	sha256sums = c7cb6fc10bc04afc8a661de4de85ebd3974bd8df695ad6043e4c9af5441bab49
-	sha256sums = 0bb07ff5efa4d7b9afcedeffc35496edb7664c2a0a8030bbdc7b368c5030638d
+	sha256sums = 897c2f1c9ec5e369dd11cba3ce6f5cb3d3d9a863a2016b6fa6bcc7df202cc030
+	sha256sums = 4b81e5bd380aa0b61d12925b498c5d307d78484feec02254f3fcc6c667eed7f2
 	sha256sums = a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa
 	sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
 
diff --git a/PKGBUILD b/PKGBUILD
index f0806c80343d..5c3c12ab089e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=plymouth
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
 url="https://www.freedesktop.org/wiki/Software/Plymouth/"
 arch=('i686' 'x86_64')
@@ -44,7 +44,7 @@ source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver
 sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba'
             'de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7'
             '7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120'
-            'b6193aefa4af4449a700bca25565ba13932ceaaf6ecd72ce1ff107f6c3466ad9'
+            '373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a'
             '0fabb974c1a301da000d5c4b9eea224ba508e577d3a6a798b67b94d4d54af255'
             '06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d'
             '86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71'
@@ -54,8 +54,8 @@ sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba'
             '3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb'
             'ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff'
             '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
-            'c7cb6fc10bc04afc8a661de4de85ebd3974bd8df695ad6043e4c9af5441bab49'
-            '0bb07ff5efa4d7b9afcedeffc35496edb7664c2a0a8030bbdc7b368c5030638d'
+            '897c2f1c9ec5e369dd11cba3ce6f5cb3d3d9a863a2016b6fa6bcc7df202cc030'
+            '4b81e5bd380aa0b61d12925b498c5d307d78484feec02254f3fcc6c667eed7f2'
             'a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa'
             '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a')
 
diff --git a/plymouth.encrypt_install b/plymouth.encrypt_install
index 0946161c97bf..5088e7dc1886 100644
--- a/plymouth.encrypt_install
+++ b/plymouth.encrypt_install
@@ -18,13 +18,6 @@ build() {
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-    add_binary "/usr/lib/plymouth/label.so"
-    add_binary "/usr/lib/plymouth/text.so"
-    add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
-    add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf"
-    add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf"
-    add_file "/etc/fonts/fonts.conf"
-    add_file "/etc/fonts/conf.d/60-latin.conf"
 
     # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
     add_binary "/usr/lib/libgcc_s.so.1"
diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install
index ca18b1c154f4..356f2a3be54b 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -1,26 +1,37 @@
+#!/bin/bash
+# /etc/initcpio/install/plymouth — mkinitcpio hook for plymouth
+
 build() {
 	add_dir /dev/pts
 	add_dir /usr/share/plymouth/themes
-	add_dir /var/run/plymouth
+	add_dir /run/plymouth
 
-	DATADIR="/usr/share"
-	PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/arch-logo.png"
+	DATADIR="/usr/share/plymouth"
+	PLYMOUTH_LOGO_FILE="${DATADIR}/arch-logo.png"
 	PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)"
-	PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
+	PLYMOUTH_THEME_DIR="${DATADIR}/themes/${PLYMOUTH_THEME_NAME}"
+    PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
 	PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+	PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
 
 	add_binary /usr/bin/plymouthd
 	add_binary /usr/bin/plymouth
 
-	add_file ${DATADIR}/plymouth/themes/text/text.plymouth
+	add_file ${DATADIR}/themes/text/text.plymouth
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so
-	add_file ${DATADIR}/plymouth/themes/details/details.plymouth
+	add_file ${DATADIR}/themes/details/details.plymouth
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so
+	add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
+    add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
+    add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf"
+    add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf"
+    add_file "/etc/fonts/fonts.conf"
+    add_file "/etc/fonts/conf.d/60-latin.conf"
 
 	add_file "${PLYMOUTH_LOGO_FILE}"
 	add_file /etc/os-release
 	add_file /etc/plymouth/plymouthd.conf
-        add_file ${DATADIR}/plymouth/plymouthd.defaults
+    add_file ${DATADIR}/plymouthd.defaults
 
 	if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
 	    echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
@@ -32,15 +43,14 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
-	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-        add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+	if [ -d ${PLYMOUTH_THEME_DIR} ]; then
+        add_full_dir ${PLYMOUTH_THEME_DIR}
+	fi
 
-		# BGRT theme depends on Spinner theme
-		if [ "${PLYMOUTH_THEME_NAME}" == "bgrt" ] && [ -d ${DATADIR}/plymouth/themes/spinner ]; then
-			add_full_dir ${DATADIR}/plymouth/themes/spinner
-		fi
+	if [ -d ${PLYMOUTH_IMAGE_DIR} ]; then
+        add_full_dir ${PLYMOUTH_IMAGE_DIR}
 	fi
-	
+
 	add_file /usr/lib/udev/rules.d/70-uaccess.rules
 	add_file /usr/lib/udev/rules.d/71-seat.rules
 
@@ -55,8 +65,7 @@ build() {
 }
 
 help() {
-	echo "This hook includes plymouth in the initramfs image."
+	cat <<HELPEOF
+This hook includes plymouth in the initramfs image.
+HELPEOF
 }
-
-# vim: set ft=sh:
-#EOF
diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install
index 5f2cad90ba2c..485ac01fe50d 100644
--- a/sd-plymouth.initcpio_install
+++ b/sd-plymouth.initcpio_install
@@ -6,28 +6,36 @@ build() {
 	add_dir /usr/share/plymouth/themes
 	add_dir /run/plymouth
 
-	DATADIR="/usr/share"
-	PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/arch-logo.png"
+	DATADIR="/usr/share/plymouth"
+	PLYMOUTH_LOGO_FILE="${DATADIR}/arch-logo.png"
 	PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)"
-	PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
+	PLYMOUTH_THEME_DIR="${DATADIR}/themes/${PLYMOUTH_THEME_NAME}"
+    PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
 	PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+	PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
 
 	add_binary /usr/bin/plymouthd
 	add_binary /usr/bin/plymouth
 
-	add_file ${DATADIR}/plymouth/themes/text/text.plymouth
+	add_file ${DATADIR}/themes/text/text.plymouth
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so
-	add_file ${DATADIR}/plymouth/themes/details/details.plymouth
+	add_file ${DATADIR}/themes/details/details.plymouth
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so
+	add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
+    add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
+    add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf"
+    add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf"
+    add_file "/etc/fonts/fonts.conf"
+    add_file "/etc/fonts/conf.d/60-latin.conf"
 
 	add_file "${PLYMOUTH_LOGO_FILE}"
 	add_file /etc/os-release
 	add_file /etc/plymouth/plymouthd.conf
-	add_file ${DATADIR}/plymouth/plymouthd.defaults
+    add_file ${DATADIR}/plymouthd.defaults
 
 	if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
-		echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
-		exit 1
+	    echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
+	    exit 1
 	fi
 
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so
@@ -35,13 +43,12 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
-	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-        add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+	if [ -d ${PLYMOUTH_THEME_DIR} ]; then
+        add_full_dir ${PLYMOUTH_THEME_DIR}
+	fi
 
-		# BGRT theme depends on Spinner theme
-		if [ "${PLYMOUTH_THEME_NAME}" == "bgrt" ] && [ -d ${DATADIR}/plymouth/themes/spinner ]; then
-			add_full_dir ${DATADIR}/plymouth/themes/spinner
-		fi
+	if [ -d ${PLYMOUTH_IMAGE_DIR} ]; then
+        add_full_dir ${PLYMOUTH_IMAGE_DIR}
 	fi
 	
 	add_udev_rule 70-uaccess.rules
author	Taijian	2020-08-08 23:58:38 +0200
committer	Taijian	2020-08-08 23:58:38 +0200
commit	ef6df38a795f83597545acb16f16e970cfe5ccda (patch)
tree	1eca7cc1c4d52aa3604c758363e3517817669e68
parent	93d6ef60fa3779e02ffcc1f13157261374e05a82 (diff)
download	aur-ef6df38a795f83597545acb16f16e970cfe5ccda.tar.gz