From 69a0b5c496ec5cf2d130e2bc9b0fcbc18721f77cbf4a40da34c7557e374c37f1 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 12 Apr 2018 10:08:25 +0000 Subject: [PATCH 1/3] Accepting request 595677 from home:oholecek:branches:Base:System - 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] OBS-URL: https://build.opensuse.org/request/show/595677 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=191 --- 0001-Add-label-ft-plugin.patch | 8 +++++++- plymouth.changes | 8 ++++++++ plymouth.spec | 7 ++++--- 3 files changed, 19 insertions(+), 4 deletions(-) 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 From cc63b0d3f547ccd972efffe7182ba13f789ac2fd3279d0b4e965d0e39725493e Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 12 Apr 2018 10:47:11 +0000 Subject: [PATCH 2/3] Accepting request 595949 from home:qzhao:branches:Base:System update by Fabian's suggestion OBS-URL: https://build.opensuse.org/request/show/595949 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=192 --- 0001-Add-label-ft-plugin.patch | 8 ++++---- plymouth.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index 9bf8078..a9f5831 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -316,8 +316,8 @@ 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) ++ ++ if (*text == '\n') + ++text; + } + @@ -460,8 +460,8 @@ index 0000000..06fe73e + + ++cur_c; + } -+ /* skip newline character */ -+ if (*cur_c) ++ ++ if(*cur_c == '\n') + ++cur_c; + + /* Next line */ diff --git a/plymouth.spec b/plymouth.spec index 9124b80..c49025b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -26,7 +26,7 @@ Release: 0 Summary: Graphical Boot Animation and Logger 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 From e68d558e96b363e6b4f8f7545e6e2783c9d9216648583656a9dc064f1981d155 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Wed, 18 Apr 2018 02:02:41 +0000 Subject: [PATCH 3/3] Accepting request 597545 from home:oholecek:branches:Base:System Revert revision 192 - https://bugzilla.suse.com/show_bug.cgi?id=1083695#c6 OBS-URL: https://build.opensuse.org/request/show/597545 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=193 --- 0001-Add-label-ft-plugin.patch | 8 ++++---- plymouth.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index a9f5831..9bf8078 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -316,8 +316,8 @@ index 0000000..06fe73e + label->area.height += (label->face->size->metrics.ascender - label->face->size->metrics.descender) >> 6; + + text = strchr (text, '\n'); -+ -+ if (*text == '\n') ++ /* skip newline character */ ++ if (text) + ++text; + } + @@ -460,8 +460,8 @@ index 0000000..06fe73e + + ++cur_c; + } -+ -+ if(*cur_c == '\n') ++ /* skip newline character */ ++ if (*cur_c) + ++cur_c; + + /* Next line */ diff --git a/plymouth.spec b/plymouth.spec index c49025b..9124b80 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -26,7 +26,7 @@ Release: 0 Summary: Graphical Boot Animation and Logger 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