Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2026-11-17 17:16:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Tue Nov 17 17:16:18 2026 rev:141 rq:1397740 version:22.02.122+94.4bd41a3 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2026-02-14 21:36:43.279172238 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new.1251/plymouth.changes 2026-11-17 17:16:45.961425756 +0100 @@ -1,0 +2,25 @@ +Tue Nov 10 14:19:06 UTC 2026 - Alberto Planas <[email protected]> + +- Fix the text rendering in the initrd (no messages or prompt text + were drawn by the graphical splash) (boo#1289972): + * plymouth-dracut: Requires plymouth-plugin-label-ft, the label + plugin that plymouth-populate-initrd adds to the initrd + * plymouth-theme-spinner (and bgrt): Requires cantarell-fonts, the + font of the theme + * Add plymouth-populate-initrd-theme-font.patch: copy the font of + the theme as /usr/share/fonts/Plymouth.ttf for label-freetype, + instead of the default font + * Drop plymouth-install-label-library-and-font-file-to-initrd.patch: + label.so does not exist anymore (it is label-pango.so, which is + not added to the initrd), and the fonts it copied were only used + by the pango plugin (boo#1183425, boo#1184309) + * Refresh plymouth-watermark-config.patch +- Use %autosetup and %autopatch: the patches 0-99 are applied + everywhere, 100 and above only in SLE +- Add plymouth-label-freetype-measure-hidden.patch: backport upstream + commit 8af62d1, the label-freetype plugin measures the text of a + hidden label. Without it, the first message of two-step is drawn + late or never, because its size is 0x0 when the theme repaints it + (boo#1289972) + +------------------------------------------------------------------- Old: ---- plymouth-install-label-library-and-font-file-to-initrd.patch New: ---- plymouth-label-freetype-measure-hidden.patch plymouth-populate-initrd-theme-font.patch ----------(Old B)---------- Old: instead of the default font * Drop plymouth-install-label-library-and-font-file-to-initrd.patch: label.so does not exist anymore (it is label-pango.so, which is ----------(Old E)---------- ----------(New B)---------- New: everywhere, 100 and above only in SLE - Add plymouth-label-freetype-measure-hidden.patch: backport upstream commit 8af62d1, the label-freetype plugin measures the text of a New: font of the theme * Add plymouth-populate-initrd-theme-font.patch: copy the font of the theme as /usr/share/fonts/Plymouth.ttf for label-freetype, ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.u4Vc9W/_old 2026-11-17 17:16:47.092473344 +0100 +++ /var/tmp/diff_new_pack.u4Vc9W/_new 2026-11-17 17:16:47.094473428 +0100 @@ -41,8 +41,6 @@ Patch3: plymouth-disable-fedora-logo.patch # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 [email protected] -- Keep the plymouth-start.service KillMode=none. Patch4: plymouth-keep-KillMode-none.patch -# PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 [email protected] -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted. -Patch5: plymouth-install-label-library-and-font-file-to-initrd.patch # PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 [email protected] -- Hide unuseful output when re-generate initrd. Patch6: plymouth-quiet-dracut-build-info.patch # PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 [email protected] -- Add two-step water mark config support. @@ -53,6 +51,10 @@ Patch9: plymouth-screen-twice-scale-on-160DPI-higher.patch # PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 [email protected] -- Confirm keyboard handler list not NULL before release memory to avoid crash. Patch10: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch +# PATCH-FIX-OPENSUSE plymouth-populate-initrd-theme-font.patch boo#1289972 [email protected] -- Copy the font of the theme for the label-freetype plugin in the initrd. +Patch11: plymouth-populate-initrd-theme-font.patch +# PATCH-FIX-UPSTREAM plymouth-label-freetype-measure-hidden.patch boo#1289972 [email protected] -- Measure the hidden labels, so the first message is drawn (upstream commit 8af62d1). +Patch12: plymouth-label-freetype-measure-hidden.patch # PATCH-FIX-SLE plymouth-support-multi-monitor-hotplugin.patch bsc#1231214 [email protected] -- support the 2nd monitor hotplugin to the system to display the same content with the first monitor. Patch13: plymouth-support-multi-monitor-hotplugin.patch # PATCH-FIX-SLE plymouth-select_fb_for_vmware.patch bsc#1234643 [email protected] -- use frame-buffer in vmware VM platform. @@ -165,6 +167,8 @@ Summary: Plymouth related utilities for dracut Group: System/Base Requires: %{name} = %{version} +# The text in the initrd is drawn by the FreeType label plugin +Requires: %{name}-plugin-label-ft = %{version} Supplements: (plymouth and dracut) BuildArch: noarch @@ -307,6 +311,8 @@ %package theme-spinner Summary: Plymouth "Spinner" theme Group: System/Base +# Font of the theme +Requires: cantarell-fonts Requires: %{name}-plugin-two-step = %{version} Requires(post): %{name}-scripts BuildArch: noarch @@ -363,21 +369,11 @@ Plymouth. %prep -%setup -q -%patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 -%patch -P 5 -p1 -%patch -P 6 -p1 -%patch -P 7 -p1 -%patch -P 8 -p1 -%patch -P 9 -p1 -%patch -P 10 -p1 -%patch -P 13 -p1 +%autosetup -N +# Patches 0-99 are applied everywhere, 100 and above only in SLE +%autopatch -p1 -M 99 %if !0%{?is_opensuse} -%patch -P 100 -p1 +%autopatch -p1 -m 100 %endif autoreconf -ivf ++++++ plymouth-label-freetype-measure-hidden.patch ++++++ >From 8af62d12848353292b03d3982c8cffc6c084de82 Mon Sep 17 00:00:00 2001 From: nerdopolis <[email protected]> Date: Mon, 8 May 2023 19:24:19 -0400 Subject: [PATCH] label-freetype: Allow the label size to be set and calculated even when hidden --- src/plugins/controls/label-freetype/plugin.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c index 0fbf094..9c9120c 100644 --- a/src/plugins/controls/label-freetype/plugin.c +++ b/src/plugins/controls/label-freetype/plugin.c @@ -184,9 +184,6 @@ size_control (ply_label_plugin_control_t *label) FT_Int width; const char *text = label->text; - if (label->is_hidden) - return; - label->area.width = 0; label->area.height = 0; @@ -216,12 +213,12 @@ trigger_redraw (ply_label_plugin_control_t *label, { ply_rectangle_t dirty_area = label->area; - if (label->is_hidden || label->display == NULL) - return; - if (adjust_size) size_control (label); + if (label->is_hidden || label->display == NULL) + return; + ply_pixel_display_draw_area (label->display, dirty_area.x, dirty_area.y, dirty_area.width, dirty_area.height); -- 2.56.0 ++++++ plymouth-populate-initrd-theme-font.patch ++++++ diff -Nura plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in --- plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in 2026-11-10 19:46:56.553155926 +0100 +++ plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in 2026-11-10 19:46:56.627278613 +0100 @@ -518,11 +518,18 @@ if [ -f "${PLYMOUTH_PLUGIN_PATH}/label-freetype.so" ]; then inst ${PLYMOUTH_PLUGIN_PATH}/label-freetype.so $INITRDDIR - font=$(fc-match -f %{file}) - inst "$font" $INITRDDIR - # The label-freetype plugin expects it at this location - mkdir -p $INITRDDIR/usr/share/fonts - ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf + # Use the font of the theme (a Pango font description, like + # "Cantarell 12", without the size), or the default font + theme_font=$(sed -n 's/^Font *= *//p' "${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth" | head -n 1 | sed 's/ *[0-9.]*$//') + font=$(fc-match -f %{file} "$theme_font") + if [ -f "$font" ]; then + inst "$font" $INITRDDIR + # The label-freetype plugin expects it at this location + mkdir -p $INITRDDIR/usr/share/fonts + ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf + else + echo "No font found for the label-freetype plugin" >&2 + fi fi if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then ++++++ plymouth-watermark-config.patch ++++++ --- /var/tmp/diff_new_pack.u4Vc9W/_old 2026-11-17 17:16:47.210478309 +0100 +++ /var/tmp/diff_new_pack.u4Vc9W/_new 2026-11-17 17:16:47.214478477 +0100 @@ -1,15 +1,15 @@ diff -Nura plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in ---- plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in 2022-10-27 12:28:09.250335251 +0800 -+++ plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in 2022-10-27 14:41:01.624380841 +0800 -@@ -491,6 +491,7 @@ +--- plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in 2026-11-10 19:46:35.898915443 +0100 ++++ plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in 2026-11-10 19:46:35.947570120 +0100 +@@ -490,6 +490,7 @@ 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 [ ! -f ${PLYMOUTH_SYSROOT}${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then + echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2 +@@ -509,6 +510,12 @@ inst_recur "${PLYMOUTH_IMAGE_DIR}" fi @@ -23,8 +23,8 @@ inst ${PLYMOUTH_PLUGIN_PATH}/label-freetype.so $INITRDDIR font=$(fc-match -f %{file}) diff -Nura plymouth-22.02.122+94.4bd41a3/src/plugins/splash/two-step/plugin.c plymouth-22.02.122+94.4bd41a3_new/src/plugins/splash/two-step/plugin.c ---- plymouth-22.02.122+94.4bd41a3/src/plugins/splash/two-step/plugin.c 2022-08-13 20:58:13.000000000 +0800 -+++ plymouth-22.02.122+94.4bd41a3_new/src/plugins/splash/two-step/plugin.c 2022-10-27 14:37:52.319120852 +0800 +--- plymouth-22.02.122+94.4bd41a3/src/plugins/splash/two-step/plugin.c 2022-08-13 14:58:13.000000000 +0200 ++++ plymouth-22.02.122+94.4bd41a3_new/src/plugins/splash/two-step/plugin.c 2026-11-10 19:46:35.947936070 +0100 @@ -1095,9 +1095,23 @@ plugin->background_tile_image = ply_image_new (image_path); free (image_path); @@ -53,8 +53,8 @@ if (!ply_kernel_command_line_has_argument ("secure_boot.warn_if_disabled=false") && !ply_is_secure_boot_enabled ()) { diff -Nura plymouth-22.02.122+94.4bd41a3/themes/bgrt/bgrt.plymouth.desktop plymouth-22.02.122+94.4bd41a3_new/themes/bgrt/bgrt.plymouth.desktop ---- plymouth-22.02.122+94.4bd41a3/themes/bgrt/bgrt.plymouth.desktop 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-22.02.122+94.4bd41a3_new/themes/bgrt/bgrt.plymouth.desktop 2022-10-27 14:38:58.846563650 +0800 +--- plymouth-22.02.122+94.4bd41a3/themes/bgrt/bgrt.plymouth.desktop 2022-04-15 10:39:24.000000000 +0200 ++++ plymouth-22.02.122+94.4bd41a3_new/themes/bgrt/bgrt.plymouth.desktop 2026-11-10 19:46:35.948186628 +0100 @@ -7,6 +7,7 @@ Font=Cantarell 12 TitleFont=Cantarell Light 30
