From 5e839f5d00f1e0196d539caa0ad423745a4468159bfe7759de8ee2138b991ece Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 16 May 2022 02:49:42 +0000 Subject: [PATCH] Accepting request 977401 from home:frispete:Tumbleweed - Add code to plymouth-watermark-config.patch in order to install the Watermark image file to initrd - Refresh patches to apply cleanly OBS-URL: https://build.opensuse.org/request/show/977401 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=323 --- 0001-Add-label-ft-plugin.patch | 48 +++++++++++-------- ...l-ft-plugin-into-initrd-if-available.patch | 11 +++-- plymouth-dracut-path.patch | 9 ++-- plymouth-watermark-config.patch | 45 +++++++++++++---- plymouth.changes | 7 +++ 5 files changed, 81 insertions(+), 39 deletions(-) diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index d7d475c..b811284 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -20,10 +20,11 @@ Signed-off-by: Fabian Vogt create mode 100644 src/plugins/controls/label-ft/Makefile.am create mode 100644 src/plugins/controls/label-ft/plugin.c -diff -Nura plymouth-0.9.5+git20200921+20778f2/configure.ac plymouth-0.9.5+git20200921+20778f2_new/configure.ac ---- plymouth-0.9.5+git20200921+20778f2/configure.ac 2020-10-05 21:49:25.578220035 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/configure.ac 2020-10-05 22:07:57.754186183 +0800 -@@ -72,6 +72,15 @@ +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,15 @@ if test x$enable_pango = xyes; then AC_SUBST(PANGO_LIBS) fi @@ -39,7 +40,7 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/configure.ac plymouth-0.9.5+git202 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes) AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes]) -@@ -312,6 +321,7 @@ +@@ -315,6 +324,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile @@ -47,10 +48,11 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/configure.ac plymouth-0.9.5+git202 src/Makefile src/client/ply-boot-client.pc src/client/Makefile -diff -Nura plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-label.c plymouth-0.9.5+git20200921+20778f2_new/src/libply-splash-graphics/ply-label.c ---- plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-label.c 2019-06-05 15:56:08.000000000 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/src/libply-splash-graphics/ply-label.c 2020-10-05 22:04:02.927286375 +0800 -@@ -96,8 +96,13 @@ +Index: b/src/libply-splash-graphics/ply-label.c +=================================================================== +--- a/src/libply-splash-graphics/ply-label.c ++++ b/src/libply-splash-graphics/ply-label.c +@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe get_plugin_interface_function_t get_label_plugin_interface; @@ -64,9 +66,10 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-lab if (label->module_handle == NULL) return false; -diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.am plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.am ---- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.am 1970-01-01 08:00:00.000000000 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.am 2020-10-05 21:31:47.608636002 +0800 +Index: b/src/plugins/controls/label-ft/Makefile.am +=================================================================== +--- /dev/null ++++ b/src/plugins/controls/label-ft/Makefile.am @@ -0,0 +1,22 @@ +AM_CPPFLAGS = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ @@ -90,9 +93,10 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Make +label_ft_la_SOURCES = $(srcdir)/plugin.c + +MAINTAINERCLEANFILES = Makefile.in -diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.in plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.in ---- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.in 1970-01-01 08:00:00.000000000 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.in 2020-10-05 21:31:54.332697346 +0800 +Index: b/src/plugins/controls/label-ft/Makefile.in +=================================================================== +--- /dev/null ++++ b/src/plugins/controls/label-ft/Makefile.in @@ -0,0 +1,753 @@ +# Makefile.in generated by automake 1.16.2 from Makefile.am. +# @configure_input@ @@ -847,9 +851,10 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Make +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/plugin.c plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/plugin.c ---- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/plugin.c 1970-01-01 08:00:00.000000000 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/plugin.c 2020-10-05 21:31:47.608636002 +0800 +Index: b/src/plugins/controls/label-ft/plugin.c +=================================================================== +--- /dev/null ++++ b/src/plugins/controls/label-ft/plugin.c @@ -0,0 +1,507 @@ +/* ply-label.c - label control + * @@ -1358,9 +1363,10 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/plug +} + +/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ -diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/Makefile.am plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/Makefile.am ---- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/Makefile.am 2018-12-27 01:23:09.000000000 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/Makefile.am 2020-10-05 21:59:39.941168232 +0800 +Index: b/src/plugins/controls/Makefile.am +=================================================================== +--- a/src/plugins/controls/Makefile.am ++++ b/src/plugins/controls/Makefile.am @@ -1,4 +1,8 @@ +SUBDIRS = if ENABLE_PANGO diff --git a/0002-Install-label-ft-plugin-into-initrd-if-available.patch b/0002-Install-label-ft-plugin-into-initrd-if-available.patch index 91e7292..34d5bc3 100644 --- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch +++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch @@ -10,11 +10,12 @@ Signed-off-by: Fabian Vogt scripts/plymouth-populate-initrd.in | 9 +++++++++ 1 file changed, 9 insertions(+) -diff -Nura plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in 2020-10-05 23:05:13.055563514 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in 2020-10-05 23:08:35.098420945 +0800 -@@ -461,6 +461,15 @@ - inst_recur "${PLYMOUTH_IMAGE_DIR}" +Index: b/scripts/plymouth-populate-initrd.in +=================================================================== +--- a/scripts/plymouth-populate-initrd.in ++++ b/scripts/plymouth-populate-initrd.in +@@ -523,6 +523,15 @@ if [ -L "${PLYMOUTH_WATERMARK_PATH}" ]; + inst_symlink "${PLYMOUTH_WATERMARK_PATH}" fi +if [ -f "${PLYMOUTH_PLUGIN_PATH}/label-ft.so" ]; then diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch index 9b5d62b..fed0874 100644 --- a/plymouth-dracut-path.patch +++ b/plymouth-dracut-path.patch @@ -1,7 +1,8 @@ -diff -Nura plymouth-0.9.5~git20210406.e554475/scripts/plymouth-populate-initrd.in plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.5~git20210406.e554475/scripts/plymouth-populate-initrd.in 2021-08-31 21:58:26.153527871 +0800 -+++ plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-populate-initrd.in 2021-08-31 22:25:36.360335610 +0800 -@@ -415,8 +415,8 @@ +Index: b/scripts/plymouth-populate-initrd.in +=================================================================== +--- a/scripts/plymouth-populate-initrd.in ++++ b/scripts/plymouth-populate-initrd.in +@@ -453,8 +453,8 @@ ddebug "Running with PLYMOUTH_LDD=$PLYMO ddebug "Running with PLYMOUTH_LDD_PATH=$PLYMOUTH_LDD_PATH" mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes diff --git a/plymouth-watermark-config.patch b/plymouth-watermark-config.patch index e5ee7a6..4ef384f 100644 --- a/plymouth-watermark-config.patch +++ b/plymouth-watermark-config.patch @@ -1,7 +1,8 @@ -diff -Nura plymouth-0.9.5~git20210406.e554475/src/plugins/splash/two-step/plugin.c plymouth-0.9.5~git20210406.e554475_new/src/plugins/splash/two-step/plugin.c ---- plymouth-0.9.5~git20210406.e554475/src/plugins/splash/two-step/plugin.c 2021-04-06 19:53:40.000000000 +0800 -+++ plymouth-0.9.5~git20210406.e554475_new/src/plugins/splash/two-step/plugin.c 2021-09-19 17:04:54.441225214 +0800 -@@ -1053,7 +1053,6 @@ +Index: b/src/plugins/splash/two-step/plugin.c +=================================================================== +--- a/src/plugins/splash/two-step/plugin.c ++++ b/src/plugins/splash/two-step/plugin.c +@@ -1055,7 +1055,6 @@ create_plugin (ply_key_file_t *key_file) plugin = calloc (1, sizeof(ply_boot_splash_plugin_t)); image_dir = ply_key_file_get_value (key_file, "two-step", "ImageDir"); @@ -9,7 +10,7 @@ diff -Nura plymouth-0.9.5~git20210406.e554475/src/plugins/splash/two-step/plugin ply_trace ("Using '%s' as working directory", image_dir); asprintf (&image_path, "%s/lock.png", image_dir); -@@ -1076,9 +1075,23 @@ +@@ -1078,9 +1077,23 @@ create_plugin (ply_key_file_t *key_file) plugin->background_tile_image = ply_image_new (image_path); free (image_path); @@ -36,10 +37,11 @@ diff -Nura plymouth-0.9.5~git20210406.e554475/src/plugins/splash/two-step/plugin plugin->animation_dir = image_dir; -diff -Nura plymouth-0.9.5~git20210406.e554475/themes/bgrt/bgrt.plymouth.desktop plymouth-0.9.5~git20210406.e554475_new/themes/bgrt/bgrt.plymouth.desktop ---- plymouth-0.9.5~git20210406.e554475/themes/bgrt/bgrt.plymouth.desktop 2021-04-06 19:53:40.000000000 +0800 -+++ plymouth-0.9.5~git20210406.e554475_new/themes/bgrt/bgrt.plymouth.desktop 2021-09-19 17:14:04.299069740 +0800 -@@ -7,6 +7,7 @@ +Index: b/themes/bgrt/bgrt.plymouth.desktop +=================================================================== +--- a/themes/bgrt/bgrt.plymouth.desktop ++++ b/themes/bgrt/bgrt.plymouth.desktop +@@ -7,6 +7,7 @@ ModuleName=two-step Font=Cantarell 12 TitleFont=Cantarell Light 30 ImageDir=@PLYMOUTH_THEME_PATH@/spinner @@ -47,3 +49,28 @@ diff -Nura plymouth-0.9.5~git20210406.e554475/themes/bgrt/bgrt.plymouth.desktop DialogHorizontalAlignment=.5 DialogVerticalAlignment=.382 TitleHorizontalAlignment=.5 +Index: b/scripts/plymouth-populate-initrd.in +=================================================================== +--- a/scripts/plymouth-populate-initrd.in ++++ b/scripts/plymouth-populate-initrd.in +@@ -491,6 +491,7 @@ fi + + PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//') + PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//') ++PLYMOUTH_WATERMARK_PATH=$(grep "WatermarkPath *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/WatermarkPath *= *//') + + PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1) + PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1) +@@ -516,6 +517,12 @@ if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMO + inst_recur "${PLYMOUTH_IMAGE_DIR}" + fi + ++# WatermarkPath is either an image file or a symlink to it ++[ -f "${PLYMOUTH_WATERMARK_PATH}" ] && inst "${PLYMOUTH_WATERMARK_PATH}" $INITRDDIR ++if [ -L "${PLYMOUTH_WATERMARK_PATH}" ]; then ++ inst_symlink "${PLYMOUTH_WATERMARK_PATH}" ++fi ++ + if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then + cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes + fi diff --git a/plymouth.changes b/plymouth.changes index abcf509..3636d38 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 15 14:38:55 UTC 2022 - Hans-Peter Jansen + +- Add code to plymouth-watermark-config.patch in order to install + the Watermark image file to initrd +- Refresh patches to apply cleanly + ------------------------------------------------------------------- Sat May 14 05:31:03 UTC 2022 - Cliff Zhao