Fix systemd integration

0001-meson-Fix-PLY_ENABLE_SYSTEMD_INTEGRATION-define.patch

@@ -0,0 +1,76 @@
+From 1de4e487fb7457871301a898cae724531bd0233d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Mon, 25 Dec 2023 13:29:25 +0000
+Subject: [PATCH] meson: Fix PLY_ENABLE_SYSTEMD_INTEGRATION define
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 522abb8d..26789060 100644
+--- a/meson.build
++++ b/meson.build
+@@ -46,58 +46,59 @@ if get_option('systemd-integration')
+   )
+   systemd_ask_password_agent = find_program('systemd-tty-ask-password-agent')
+ endif
+ 
+ if get_option('upstart-monitoring')
+   dbus_dep = dependency('dbus-1')
+   curses_dep = dependency('curses')
+ endif
+ 
+ # Logo
+ plymouth_logo_file = get_option('logo')
+ use_fallback_logo = plymouth_logo_file == ''
+ if use_fallback_logo
+   plymouth_logo_file = get_option('prefix') / get_option('datadir') / 'plymouth' / 'bizcom.png'
+ endif
+ 
+ # Global C flags
+ add_project_arguments([
+     '-D_GNU_SOURCE',
+     '-include', 'config.h',
+   ],
+   language: 'c'
+ )
+ 
+ # config.h
+ conf = configuration_data()
+ conf.set_quoted('BOOT_TTY', get_option('boot-tty'))
+ conf.set_quoted('SHUTDOWN_TTY', get_option('shutdown-tty'))
+ conf.set_quoted('RELEASE_FILE', get_option('release-file'))
+ conf.set('HAVE_UDEV', libudev_dep.found())
++conf.set('PLY_ENABLE_SYSTEMD_INTEGRATION', get_option('systemd-integration'))
+ conf.set('PLY_ENABLE_TRACING', get_option('tracing'))
+ conf.set_quoted('PLYMOUTH_RUNTIME_DIR', plymouth_runtime_dir)
+ conf.set_quoted('PLYMOUTH_THEME_PATH', plymouth_theme_path)
+ conf.set_quoted('PLYMOUTH_RUNTIME_THEME_PATH', plymouth_runtime_theme_path)
+ conf.set_quoted('PLYMOUTH_PLUGIN_PATH', plymouth_plugin_path)
+ conf.set_quoted('PLYMOUTH_POLICY_DIR', plymouth_policy_dir)
+ conf.set_quoted('PLYMOUTH_CONF_DIR', plymouth_conf_dir)
+ conf.set_quoted('PLYMOUTH_TIME_DIRECTORY', plymouth_time_dir)
+ conf.set('HAVE_NCURSESW_TERM_H', get_option('upstart-monitoring')? cc.has_header('ncursesw/term.h') : false)
+ conf.set('HAVE_NCURSES_TERM_H', get_option('upstart-monitoring')? cc.has_header('ncurses/term.h') : false)
+ config_file = configure_file(
+   output: 'config.h',
+   configuration: conf,
+ )
+ config_h_inc = include_directories('.')
+ 
+ # Subdirectories
+ subdir('images')
+ subdir('po')
+ subdir('src')
+ subdir('themes')
+ subdir('scripts')
+ if get_option('systemd-integration')
+   subdir('systemd-units')
+ endif
+ if get_option('docs')
+   subdir('docs')
+ endif
+-- 
+2.43.0
+

0001-plymouth-populate-initrd-Fix-usage-message.patch

@@ -0,0 +1,83 @@
+From 2f89dc90609dcbe9f500c41ea2bbfc83a7e4922e Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 25 Dec 2023 11:07:47 -0500
+Subject: [PATCH] plymouth-populate-initrd: Fix usage message
+
+It currently says the scripts name is `plymouth` not
+`plymouth-populate-initrd`.
+
+This commit changes it to use $0
+---
+ scripts/plymouth-populate-initrd.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
+index 1c29e4c7..8ccac22c 100755
+--- a/scripts/plymouth-populate-initrd.in
++++ b/scripts/plymouth-populate-initrd.in
+@@ -397,61 +397,61 @@ function read_setting_from_file()
+ # $1: Configuration file
+ function set_configured_theme_path_from_file()
+ {
+     CONFIGURED_THEME_DIR=$(read_setting_from_file "$1" "ThemeDir")
+     CONFIGURED_THEME_NAME=$(read_setting_from_file "$1" "Theme")
+ }
+ 
+ function set_theme_dir()
+ {
+     set_configured_theme_path_from_file ${PLYMOUTH_CONFDIR}/plymouthd.conf
+     if [ -z "$CONFIGURED_THEME_DIR" ] || [ ! -d "$CONFIGURED_THEME_DIR/$CONFIGURED_THEME_NAME" ]; then
+         set_configured_theme_path_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults
+     fi
+ 
+     if [ -n "$CONFIGURED_THEME_DIR" ] && [ -d "$CONFIGURED_THEME_DIR/$CONFIGURED_THEME_NAME" ]; then
+         PLYMOUTH_THEME_NAME=$CONFIGURED_THEME_NAME
+         PLYMOUTH_THEME_DIR=$CONFIGURED_THEME_DIR/$CONFIGURED_THEME_NAME
+     else
+         PLYMOUTH_THEME_DIR=$PLYMOUTH_DATADIR/plymouth/themes/$PLYMOUTH_THEME_NAME
+     fi
+ }
+ 
+ function usage() {
+     local output="/proc/self/fd/1"
+     local rc=0
+     if [ "$1" == "error" ]; then
+         output="/proc/self/fd/2"
+         rc=1
+     fi
+ 
+-    echo "usage: plymouth [ --verbose | -v ] { --targetdir | -t } <initrd_directory> { --x11-directory | -x } <x11_directory>" > $output
++    echo "usage: $0 [ --verbose | -v ] { --targetdir | -t } <initrd_directory> { --x11-directory | -x } <x11_directory>" > $output
+     exit $rc
+ }
+ 
+ verbose=false
+ INITRDDIR=""
+ X11_DIRECTORY="/usr/share/X11"
+ while [ $# -gt 0 ]; do
+     case $1 in
+         --verbose|-v)
+             verbose=true
+             ;;
+         --targetdir|-t)
+             shift
+             INITRDDIR="$1"
+             ;;
+         --help|-h)
+             usage normal
+             ;;
+         --x11-directory|-x)
+             shift
+             X11_DIRECTORY="$1"
+             ;;
+         *)
+             usage error
+             break
+             ;;
+     esac
+     shift
+ done
+ 
+-- 
+2.43.0
+

plymouth.spec

@@ -8,6 +8,9 @@ URL: http://www.freedesktop.org/wiki/Software/Plymouth
 Source0: https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/%{version}/%{name}-%{version}.tar.bz2
 Source2: charge.plymouth
 
+Patch: 0001-plymouth-populate-initrd-Fix-usage-message.patch
+Patch: 0001-meson-Fix-PLY_ENABLE_SYSTEMD_INTEGRATION-define.patch
+
 BuildRequires: meson
 BuildRequires: fedora-logos
 BuildRequires: gcc libtool git