rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 988583 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/988583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=107
This commit is contained in:
Dominique Leuenberger 2022-07-13 12:31:50 +00:00 committed by Git OBS Bridge
commit 857dd3f7f2
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
0004-label-ft-fix-alignment.patch Normal file
View File

@ -0,0 +1,21 @@
From: Alfonso Sanchez-Beato <alfonso.sanchez-beato@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')
{

11
plymouth.changes
View File

@ -1,8 +1,15 @@
-------------------------------------------------------------------
Mon Jul 11 13:01:49 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Add 0004-label-ft-fix-alignment.patch: to fix alignment with
label-ft in some cases (boo#959986).
-------------------------------------------------------------------
Wed Jun 29 08:52:34 UTC 2022 - Stefan Schubert <schubi@suse.com>
- 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.
-------------------------------------------------------------------
Sun May 15 15:58:33 UTC 2022 - Cliff Zhao <qzhao@suse.com>

8
plymouth.spec
View File

@ -55,11 +55,13 @@ Patch10: plymouth-log-on-default.patch
# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@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 fvogt@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 fvogt@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 fvogt@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 fvogt@suse.com -- fix alignment for label-ft
Patch1004: 0004-label-ft-fix-alignment.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc