diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index 6d8bf54..9bf8078 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -113,7 +113,7 @@ new file mode 100644 index 0000000..06fe73e --- /dev/null +++ b/src/plugins/controls/label-ft/plugin.c -@@ -0,0 +1,501 @@ +@@ -0,0 +1,507 @@ +/* ply-label.c - label control + * + * 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; + + text = strchr (text, '\n'); ++ /* skip newline character */ ++ if (text) ++ ++text; + } + + /* If centered, area.x is not the origin anymore */ @@ -457,6 +460,9 @@ index 0000000..06fe73e + + ++cur_c; + } ++ /* skip newline character */ ++ if (*cur_c) ++ ++cur_c; + + /* Next line */ + pen.y += label->face->size->metrics.height; diff --git a/plymouth.changes b/plymouth.changes index 6681fc9..a0ca170 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -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 diff --git a/plymouth.spec b/plymouth.spec index 8cc51e7..9124b80 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -24,9 +24,9 @@ Name: plymouth Version: 0.9.3+git20171220.6e9e95d Release: 0 Summary: Graphical Boot Animation and Logger -License: GPL-2.0+ +License: GPL-2.0-or-later 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 Source0: %{name}-%{version}.tar.xz Source1: boot-duration @@ -491,7 +491,8 @@ fi %files %defattr(-, root, root) -%doc AUTHORS NEWS README COPYING +%license COPYING +%doc AUTHORS NEWS README %dir %{_datadir}/plymouth %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details