Sync with plymouth

5 files changed, 100 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12667ac325dc..e3b472ca1089 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plymouth-nosystemd
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support for non-systemd setups
 	pkgver = 22.02.122
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.freedesktop.org/wiki/Software/Plymouth
 	arch = i686
 	arch = x86_64
@@ -10,13 +10,10 @@ pkgbase = plymouth-nosystemd
 	depends = libdrm
 	depends = pango
 	depends = elogind
-	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
 	provides = plymouth
 	conflicts = plymouth
-	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 = artix-logo.png
@@ -26,13 +23,17 @@ pkgbase = plymouth-nosystemd
 	source = plymouth.initcpio_install
 	source = plymouth-update-initrd.patch
 	source = plymouthd.conf.patch
+	source = ply-utils.c.patch
+	source = runstatedir.patch
 	sha256sums = 8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6
 	sha256sums = 2a218ad4f7c202f0164eeccf02263b88b6c93c21301f346270e8bdd40463132c
 	sha256sums = 748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7
 	sha256sums = 373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a
 	sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
-	sha256sums = b72713969814dce5d1cd9f7fd75ed91ea06c72558602e22b16848e2e907e19ad
+	sha256sums = 14ca377af62a0d27f30fd2acb66a5fb6ab584ead317116c3985e3e764929004d
 	sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
 	sha256sums = 71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2
+	sha256sums = 1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b
+	sha256sums = 7c0224737119f949b8d5ca24c438f253b5734e3391a47e8f5f1dda28b8c4ab92
 
 pkgname = plymouth-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 2509f7988902..96832b96ef7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgname=plymouth
 pkgname=${_pkgname}-nosystemd
 pkgver=22.02.122
-pkgrel=2
+pkgrel=3
 pkgdesc="A graphical boot splash screen with kernel mode-setting support for non-systemd setups"
 url="http://www.freedesktop.org/wiki/Software/Plymouth"
 arch=('i686' 'x86_64')
@@ -16,15 +16,12 @@ license=('GPL')
 
 depends=('libdrm' 'pango' 'elogind')
 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')
 provides=('plymouth')
 conflicts=('plymouth')
 backup=('etc/plymouth/plymouthd.conf')
 
-options=('!libtool' '!emptydirs')
-
 source=("https://gitlab.freedesktop.org/${_pkgname}/${_pkgname}/-/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
        'artix-logo.png'
        'plymouth.encrypt_hook'
@@ -33,6 +30,8 @@ source=("https://gitlab.freedesktop.org/${_pkgname}/${_pkgname}/-/archive/${pkgv
        'plymouth.initcpio_install'
        'plymouth-update-initrd.patch'
        'plymouthd.conf.patch'
+       'ply-utils.c.patch'
+       'runstatedir.patch'
 )
 
 sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
@@ -40,19 +39,21 @@ sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
             '748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7'
             '373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a'
             '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
-            'b72713969814dce5d1cd9f7fd75ed91ea06c72558602e22b16848e2e907e19ad'
+            '14ca377af62a0d27f30fd2acb66a5fb6ab584ead317116c3985e3e764929004d'
             '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a'
             '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2'
-)
+            '1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b'
+            '7c0224737119f949b8d5ca24c438f253b5734e3391a47e8f5f1dda28b8c4ab92')
 
 prepare() {
   cd "$srcdir"/${_pkgname}-${pkgver}
   patch -p1 -i $srcdir/plymouth-update-initrd.patch
-# systemd
-# patch -p1 -i $srcdir/plymouth-quit.service.in.patch
+  # systemd
+  # patch -p1 -i $srcdir/plymouth-quit.service.in.patch
   patch -p1 -i $srcdir/plymouthd.conf.patch
-# comment on plymouth from 2022-08-15T12:25
-  sed -i '/linux\/fs.h/d' src/libply/ply-utils.c
+  # apply upstream patches
+  patch -p1 -i $srcdir/ply-utils.c.patch
+  patch -p1 -i $srcdir/runstatedir.patch
 }
 
 build() {
@@ -77,7 +78,8 @@ build() {
     --with-background-start-color-stop=0x000000 \
     --with-background-end-color-stop=0x4D4D4D \
     --without-rhgb-compat-link \
-    --without-system-root-install
+    --without-system-root-install \
+    --runstatedir=/run
 
   make
 }
@@ -95,4 +97,6 @@ package() {
   install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
 
   install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
+  #remove unused scripts, a comment on plymouth says it breaks dracut, so commented
+  #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 8c7876a3b8ed..77f5823f5c24 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -29,21 +29,10 @@ build() {
 	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/runstatedir.patch b/runstatedir.patch
new file mode 100644
index 000000000000..963b6e910e07
--- /dev/null
+++ b/runstatedir.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index 608ad02c8b268f1ffa6e0ba62dea7da2eaed0636..34a2f2ce68abe648f79ccbf93505f1ccf8c4d744 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then
+   AC_SUBST(SYSTEMD_UNIT_DIR)
+ fi
+ 
+-AC_ARG_WITH([runtimedir],
+-            AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]),
+-            [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""])
++AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], [])
+ 
+ AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=no)
+ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL,  [test "$with_system_root_install" = yes])
+@@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL,  [test "$with_system_root_install" = ye
+ if test x$with_system_root_install = xyes; then
+   plymouthclientdir=/bin
+   plymouthdaemondir=/sbin
+-  if (test -z "${plymouthruntimedir}"); then
+-    plymouthruntimedir=/run/plymouth
+-  fi
+ else
+   plymouthclientdir=$bindir
+   plymouthdaemondir=$sbindir
+-  if (test -z "${plymouthruntimedir}"); then
+-    plymouthruntimedir=$localstatedir/run/plymouth
+-  fi
+ fi
++plymouthruntimedir=$runstatedir/plymouth
+ AC_SUBST(plymouthclientdir)
+ AC_SUBST(plymouthdaemondir)
+ AC_SUBST(plymouthruntimedir)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad3655d5944cebad36761cee44d9d79241a6d942..abd7a4ce2aafa21b73303b9cc6d3639c58706a90 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,7 +37,7 @@ escrow_PROGRAMS = plymouthd-fd-escrow
+ 
+ plymouthd_fd_escrow_SOURCES = plymouthd-fd-escrow.c
+ 
+-plymouthdrundir = $(localstatedir)/run/plymouth
++plymouthdrundir = $(plymouthruntimedir)
+ plymouthdspooldir = $(localstatedir)/spool/plymouth
+ plymouthdtimedir = $(localstatedir)/lib/plymouth
+