pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 597605 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/597605
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2018-04-20 15:23:39 +00:00 committed by Git OBS Bridge
commit 93eba41d19
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Add-label-ft-plugin.patch
View File

@ -113,7 +113,7 @@ new file mode 100644
index 0000000..06fe73e index 0000000..06fe73e
--- /dev/null --- /dev/null
+++ b/src/plugins/controls/label-ft/plugin.c +++ b/src/plugins/controls/label-ft/plugin.c
@@ -0,0 +1,501 @@ @@ -0,0 +1,507 @@
+/* ply-label.c - label control +/* ply-label.c - label control
+ * + *
+ * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008 Red Hat, Inc.
@ -316,6 +316,9 @@ index 0000000..06fe73e
+ label->area.height += (label->face->size->metrics.ascender - label->face->size->metrics.descender) >> 6; + label->area.height += (label->face->size->metrics.ascender - label->face->size->metrics.descender) >> 6;
+ +
+ text = strchr (text, '\n'); + text = strchr (text, '\n');
+ /* skip newline character */
+ if (text)
+ ++text;
+ } + }
+ +
+ /* If centered, area.x is not the origin anymore */ + /* If centered, area.x is not the origin anymore */
@ -457,6 +460,9 @@ index 0000000..06fe73e
+ +
+ ++cur_c; + ++cur_c;
+ } + }
+ /* skip newline character */
+ if (*cur_c)
+ ++cur_c;
+ +
+ /* Next line */ + /* Next line */
+ pen.y += label->face->size->metrics.height; + pen.y += label->face->size->metrics.height;

8
plymouth.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Apr 11 12:44:36 UTC 2018 - oholecek@suse.com
- Modify 0001-Add-label-ft-plugin.patch to fix problems with
multiline text (bsc#1083695)
* to prevent infinite loop newline characters need to be skipped
- Use %license instead of %doc [bsc#1082318]
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 13 21:20:16 UTC 2018 - zaitor@opensuse.org Sat Jan 13 21:20:16 UTC 2018 - zaitor@opensuse.org

7
plymouth.spec
View File

@ -24,9 +24,9 @@ Name: plymouth
Version: 0.9.3+git20171220.6e9e95d Version: 0.9.3+git20171220.6e9e95d
Release: 0 Release: 0
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Base Group: System/Base
Url: http://freedesktop.org/software/plymouth/releases URL: http://freedesktop.org/software/plymouth/releases
# Switched to git snapshot to ease bugfix inclusion # Switched to git snapshot to ease bugfix inclusion
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: boot-duration Source1: boot-duration
@ -491,7 +491,8 @@ fi
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS NEWS README COPYING %license COPYING
%doc AUTHORS NEWS README
%dir %{_datadir}/plymouth %dir %{_datadir}/plymouth
%dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes
%dir %{_datadir}/plymouth/themes/details %dir %{_datadir}/plymouth/themes/details