Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 935530 - [kde overlay] kde-apps/konsole-9999 konsole-23.08.1-drop-unused-X11-dep.patch needs rebased
Summary: [kde overlay] kde-apps/konsole-9999 konsole-23.08.1-drop-unused-X11-dep.patch...
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: https://invent.kde.org/utilities/kons...
Whiteboard:
Keywords: UPSTREAM
Depends on:
Blocks:
 
Reported: 2024-07-05 07:48 UTC by Duncan
Modified: 2024-07-12 17:40 UTC (History)
0 users

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Duncan 2024-07-05 07:48:08 UTC
Timestamp of repository kde: Thu, 04 Jul 2024 17:35:53 +0000
Head commit of repository kde: 2115bd4d

Upstream...

* commit cf30b8413e979580708e8e270bfb6ebd2e0e7e73
| Author:     Marius Pa <nmariusp1@>
| AuthorDate: Mon Jul 1 23:29:08 2024 +0000
| Commit:     Kurt Hindenburg <khindenburg@>
| CommitDate: Mon Jul 1 23:29:08 2024 +0000
|
|     Fix cmakelint issues

... messes with spacing in the CMakeLists.txt if(NOT WITHOUT_X11) line that the gentoo/kde drop-unused-X11-dep patch removes, so our patch no longer applies.  Looks like it had been fuzzing for awhile, tho, as the if(NOT APPLE) line of our patch wasn't matching before that commit.

So the gentoo/kde patch needs rebased.
Comment 1 Andreas Sturmlechner gentoo-dev 2024-07-07 21:34:01 UTC
Trying to fix it properly instead.
Comment 2 Larry the Git Cow gentoo-dev 2024-07-12 17:24:37 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=78bd9817c4965c0b54bc60a6b38d805ac2bdccd3

commit 78bd9817c4965c0b54bc60a6b38d805ac2bdccd3
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2024-07-12 17:22:34 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2024-07-12 17:22:34 +0000

    kde-apps/konsole: Re-add IUSE X, add missing USEdep, drop obsolete patch
    
    Amends (rather fixes) commit 6663a2bf1415d295444b5500d6911ee6e6f15727.
    
    Upstream commit c5f2315c9df05ca069de25ab741d9fc38a6de21a
    
    Closes: https://bugs.gentoo.org/935530
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../konsole-23.08.1-drop-unused-X11-dep.patch      | 30 ----------------------
 kde-apps/konsole/konsole-9999.ebuild               | 11 +++++---
 2 files changed, 8 insertions(+), 33 deletions(-)
Comment 3 Larry the Git Cow gentoo-dev 2024-07-12 17:40:24 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b7e3ec2f89f77780354cd607642b9895ca19ac

commit d0b7e3ec2f89f77780354cd607642b9895ca19ac
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2024-07-12 17:22:34 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2024-07-12 17:33:35 +0000

    kde-apps/konsole: Re-add IUSE X, add missing USEdep, drop obsolete patch
    
    Amends (rather fixes) commit 6663a2bf1415d295444b5500d6911ee6e6f15727.
    
    Upstream commit c5f2315c9df05ca069de25ab741d9fc38a6de21a
    
    Bug: https://bugs.gentoo.org/935530
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-apps/konsole/files/konsole-24.05.2-cmake.patch | 135 +++++++++++++++++++++
 kde-apps/konsole/konsole-24.05.2-r1.ebuild         |  67 ++++++++++
 2 files changed, 202 insertions(+)