Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 670810 - [kde overlay] kde-plasma/plasma-workspace-9999 plasma-workspace-5.4-startkde-script.patch broken
Summary: [kde overlay] kde-plasma/plasma-workspace-9999 plasma-workspace-5.4-startkde-...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-11-10 07:00 UTC by Duncan
Modified: 2018-11-10 18:50 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
Updated startkde-script.patch (plasma-workspace-9999-startkde-script.patch,1.18 KB, patch)
2018-11-10 07:56 UTC, Duncan
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Duncan 2018-11-10 07:00:08 UTC
Upstream plasma-workspace commit 537451326 drops X11 core fonts code from startkde/startplasma.  Unfortunately, that breaks gentoo's plasma-workspace-5.4-startkde-script.patch, hunk 1, which had the font code in startkde.cmake as the closing context for the hunk, resulting in the following error:

>>> Preparing source in /tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999 ...
* Applying plasma-workspace-5.4-startkde-script.patch ...
1 out of 2 hunks FAILED -- saving rejects to file startkde/startkde.cmake.rej
* ERROR: kde-plasma/plasma-workspace-9999::kde failed (prepare phase):
Comment 1 Duncan 2018-11-10 07:56:43 UTC
Created attachment 554722 [details, diff]
Updated startkde-script.patch

Updated patch.
Comment 2 Larry the Git Cow gentoo-dev 2018-11-10 18:50:04 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=0626526494dfa356290323670f1a63e436d83f7f

commit 0626526494dfa356290323670f1a63e436d83f7f
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2018-11-10 18:24:58 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2018-11-10 18:46:11 +0000

    kde-plasma/plasma-workspace: Rebase startkde-script.patch, drop RDEPENDs
    
    Upstream commit 5374513266ee707dee23ef43db7eba18c7b6cb3b
    
    Thanks-to: Duncan <1i5t5.duncan@cox.net>
    Closes: https://bugs.gentoo.org/670810
    Package-Manager: Portage-2.3.51, Repoman-2.3.12
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../plasma-workspace-5.14.80-startkde-script.patch | 39 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  4 +--
 2 files changed, 40 insertions(+), 3 deletions(-)