add patch to fix build failure & fix font dependencies for initramfs generation

5 files changed, 51 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5790998cfa02..eba60e15603a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plymouth
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support
 	pkgver = 22.02.122
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
 	arch = x86_64
@@ -10,11 +10,8 @@ pkgbase = plymouth
 	depends = libdrm
 	depends = pango
 	depends = systemd
-	optdepends = ttf-dejavu: For true type font support
+	optdepends = cantarell-fonts: 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
-	options = !libtool
-	options = !emptydirs
 	backup = etc/plymouth/plymouthd.conf
 	source = https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/22.02.122/plymouth-22.02.122.tar.gz
 	source = arch-logo.png
@@ -30,6 +27,7 @@ pkgbase = plymouth
 	source = plymouth-quit.service.in.patch
 	source = plymouth-update-initrd.patch
 	source = plymouthd.conf.patch
+	source = ply-utils.c.patch
 	sha256sums = 8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6
 	sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
 	sha256sums = 748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7
@@ -39,10 +37,11 @@ pkgbase = plymouth
 	sha256sums = c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba
 	sha256sums = 3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb
 	sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
-	sha256sums = d2201253d9f4a1f7e556e60a04401237273a4577e157a8c4471d5c81bff88ccd
-	sha256sums = d254f3d01631024ed4563d39fcaa631b0ace097faf7ed05de382859ccfa48a08
+	sha256sums = fe425b7aa1e17b32267b4d46a0157ed6943763c77598e183df75e2efafd07efd
+	sha256sums = 9f34e5efb3a4ecdb2095d9f0f5f7a01f1033b2ba1fcbf172dbaafc2c37043b03
 	sha256sums = dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a
 	sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
 	sha256sums = 71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2
+	sha256sums = 1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b
 
 pkgname = plymouth
diff --git a/PKGBUILD b/PKGBUILD
index 72a686843405..4bcb52c02a99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=plymouth
 pkgver=22.02.122
-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')
@@ -14,13 +14,10 @@ license=('GPL')
 
 depends=('libdrm' 'pango' 'systemd')
 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')
+optdepends=('cantarell-fonts: For true type font support'
+        'xf86-video-fbdev: Support special graphic cards on early startup')
 backup=('etc/plymouth/plymouthd.conf')
 
-options=('!libtool' '!emptydirs')
-
 source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
       'arch-logo.png'
        'plymouth.encrypt_hook'
@@ -35,6 +32,7 @@ source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver
        'plymouth-quit.service.in.patch'
        'plymouth-update-initrd.patch'
        'plymouthd.conf.patch'
+       'ply-utils.c.patch'
 )
 
 sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
@@ -46,17 +44,20 @@ sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
             'c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba'
             '3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb'
             '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
-            'd2201253d9f4a1f7e556e60a04401237273a4577e157a8c4471d5c81bff88ccd'
-            'd254f3d01631024ed4563d39fcaa631b0ace097faf7ed05de382859ccfa48a08'
+            'fe425b7aa1e17b32267b4d46a0157ed6943763c77598e183df75e2efafd07efd'
+            '9f34e5efb3a4ecdb2095d9f0f5f7a01f1033b2ba1fcbf172dbaafc2c37043b03'
             'dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a'
             '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a'
-            '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2')
+            '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2'
+            '1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b')
 
 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/plymouthd.conf.patch
+	# apply upstream patch
+	patch -p1 -i $srcdir/ply-utils.c.patch
 }
 
 build() {
@@ -106,4 +107,7 @@ package() {
 
 	install -Dm644 "$srcdir/plymouth-deactivate.service" 	"$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
 	install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
+	
+	# remove unused scripts
+	rm -rf "$pkgdir"/usr/lib/plymouth/plymouth-{generate,populate}-initrd
 }
diff --git a/ply-utils.c.patch b/ply-utils.c.patch
new file mode 100644
index 000000000000..77aeadf31ba4
--- /dev/null
+++ b/ply-utils.c.patch
@@ -0,0 +1,28 @@
+@@ -0,0 +1,30 @@
+From 5f1e43c00039a7fe1fff768b91a05a695fb4a53d Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 3 Aug 2022 15:23:33 -0400
+Subject: [PATCH] ply-utils: Drop linux/fs.h include
+
+It was needed long ago for a function we no longer even have.
+
+Now it's causing compile errors on Fedora 37 because it's conflicting
+with sys/mount.h.
+
+This commit drops it.
+---
+ src/libply/ply-utils.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
+index c7b165e9..219e2e77 100644
+--- a/src/libply/ply-utils.c
++++ b/src/libply/ply-utils.c
+@@ -46,7 +46,6 @@
+ #include <sys/user.h>
+ #include <sys/wait.h>
+ #include <time.h>
+-#include <linux/fs.h>
+ #include <linux/vt.h>
+ 
+ #include <dlfcn.h>
diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install
index 2bd0a2ffbe45..5d5f52e5f9d1 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -28,22 +28,10 @@ build() {
 	add_file /etc/plymouth/plymouthd.conf
 	add_file ${DATADIR}/plymouthd.defaults
 	
-	
-	if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" -o -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
+	if [ -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
 		add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
 		add_file "/etc/fonts/fonts.conf"
-	fi
-	
-	if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" ]; then
-		add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
-		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 "/usr/share/fonts/cantarell/Cantarell-VF.otf"
 		if [ -f "/etc/fonts/conf.d/60-latin.conf" ]; then
 		  add_file "/etc/fonts/conf.d/60-latin.conf"
 		fi
diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install
index 9944f8979dd5..abf1f4d4a438 100644
--- a/sd-plymouth.initcpio_install
+++ b/sd-plymouth.initcpio_install
@@ -28,22 +28,10 @@ build() {
 	add_file /etc/plymouth/plymouthd.conf
 	add_file ${DATADIR}/plymouthd.defaults
 	
-	
-	if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" -o -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
+	if [ -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
 		add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
 		add_file "/etc/fonts/fonts.conf"
-	fi
-	
-	if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" ]; then
-		add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
-		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 "/usr/share/fonts/cantarell/Cantarell-VF.otf"
 		if [ -f "/etc/fonts/conf.d/60-latin.conf" ]; then
 		  add_file "/etc/fonts/conf.d/60-latin.conf"
 		fi