add patch to fix install failure

3 files changed, 56 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eba60e15603a..020ec12f8d06 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 = 2
+	pkgrel = 3
 	url = https://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
 	arch = x86_64
@@ -28,6 +28,7 @@ pkgbase = plymouth
 	source = plymouth-update-initrd.patch
 	source = plymouthd.conf.patch
 	source = ply-utils.c.patch
+	source = runstatedir.patch
 	sha256sums = 8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6
 	sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
 	sha256sums = 748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7
@@ -43,5 +44,6 @@ pkgbase = plymouth
 	sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
 	sha256sums = 71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2
 	sha256sums = 1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b
+	sha256sums = 7c0224737119f949b8d5ca24c438f253b5734e3391a47e8f5f1dda28b8c4ab92
 
 pkgname = plymouth
diff --git a/PKGBUILD b/PKGBUILD
index 4bcb52c02a99..6277dfad1ec7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=plymouth
 pkgver=22.02.122
-pkgrel=2
+pkgrel=3
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
 url="https://www.freedesktop.org/wiki/Software/Plymouth/"
 arch=('i686' 'x86_64')
@@ -33,6 +33,7 @@ source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver
        'plymouth-update-initrd.patch'
        'plymouthd.conf.patch'
        'ply-utils.c.patch'
+       'runstatedir.patch'
 )
 
 sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
@@ -49,15 +50,17 @@ sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
             'dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a'
             '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a'
             '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2'
-            '1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b')
+            '1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b'
+            '7c0224737119f949b8d5ca24c438f253b5734e3391a47e8f5f1dda28b8c4ab92')
 
 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
+	# apply upstream patches
 	patch -p1 -i $srcdir/ply-utils.c.patch
+	patch -p1 -i $srcdir/runstatedir.patch
 }
 
 build() {
@@ -83,7 +86,7 @@ build() {
 		--with-background-end-color-stop=0x4D4D4D \
 		--without-rhgb-compat-link \
 		--without-system-root-install \
-		--with-runtimedir=/run
+		--runstatedir=/run
 
 	make
 }
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
+