Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2022-07-13 14:31:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Wed Jul 13 14:31:50 2022 rev:107 rq:988583 version:0.9.5~git20220412.e960111
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2022-07-05
12:27:02.573832551 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new.1523/plymouth.changes
2022-07-13 14:32:02.269261298 +0200
@@ -1,0 +2,6 @@
+Mon Jul 11 13:01:49 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Add 0004-label-ft-fix-alignment.patch: to fix alignment with
+ label-ft in some cases (boo#959986).
+
+-------------------------------------------------------------------
@@ -4,2 +10,3 @@
-- Moved logrotate files from user specific directory /etc/logrotate.d
- to vendor specific directory /usr/etc/logrotate.d.
+- Update plymouth.spec: Moved logrotate files from user specific
+ directory /etc/logrotate.d to vendor specific directory
+ /usr/etc/logrotate.d.
New:
----
0004-label-ft-fix-alignment.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.3bQvLi/_old 2022-07-13 14:32:02.953262181 +0200
+++ /var/tmp/diff_new_pack.3bQvLi/_new 2022-07-13 14:32:02.957262186 +0200
@@ -55,11 +55,13 @@
# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087
boo#1182145 qz...@suse.com -- Keep the plymouth-start.service KillMode=none.
Patch11: plymouth-keep-KillMode-none.patch
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fv...@suse.com
-- add ability to output text in initrd needed for encryption.
-Patch1000: 0001-Add-label-ft-plugin.patch
+Patch1001: 0001-Add-label-ft-plugin.patch
# PATCH-FIX-UPSTREAM
0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986
fv...@suse.com -- add ability to output text in initrd needed for encryption.
-Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
+Patch1002: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fv...@suse.com --
add ability to output text in initrd needed for encryption.
-Patch1002: 0003-fix_null_deref.patch
+Patch1003: 0003-fix_null_deref.patch
+# PATCH-FIX-UPSTREAM 0004-label-ft-fix-alignment.patch boo#959986
fv...@suse.com -- fix alignment for label-ft
+Patch1004: 0004-label-ft-fix-alignment.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc
++++++ 0004-label-ft-fix-alignment.patch ++++++
From: Alfonso Sanchez-Beato <alfonso.sanchez-be...@canonical.com>
Subject: fix alignment for label-ft
label->width is used to calculate wrapping of lines and it is by
default -1. We need to use label->area.width instead when aligning a
line, as label->width might not have been set.
--- plymouth-0.9.5+git20211018.orig/src/plugins/controls/label-ft/plugin.c
+++ plymouth-0.9.5+git20211018/src/plugins/controls/label-ft/plugin.c
@@ -324,9 +324,9 @@ draw_control (ply_label_plugin_control_t
/* Start at start position (alignment) */
if(label->alignment == PLY_LABEL_ALIGN_CENTER)
- pen.x += (label->width - width_of_line(label, cur_c)) << 5;
+ pen.x += (label->area.width - width_of_line(label, cur_c))
<< 5;
else if(label->alignment == PLY_LABEL_ALIGN_RIGHT)
- pen.x += (label->width - width_of_line(label, cur_c)) << 6;
+ pen.x += (label->area.width - width_of_line(label, cur_c))
<< 6;
while(*cur_c && *cur_c != '\n')
{
