Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 887087 - [kde overlay] kde-plasma/kwin-9999 kwin-5.21.80-gstreamer-optional.patch needs rebased as of upstream f94b8bfa8
Summary: [kde overlay] kde-plasma/kwin-9999 kwin-5.21.80-gstreamer-optional.patch need...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-12-19 02:21 UTC by Duncan
Modified: 2022-12-24 23:48 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 2022-12-19 02:21:57 UTC
The error:
* Applying kwin-5.21.80-gstreamer-optional.patch ...
can't find file to patch at input line 14

Culprit upstream kwin commit:

* commit f94b8bfa8
Author:     Vlad Zahorodnii <vlad.zahorodnii@despammed>
AuthorDate: Sat Dec 17 16:08:19 2022 +0200
Commit:     Ben Cooksley <bcooksley@despammed>
CommitDate: Sat Dec 17 20:02:16 2022 +0000

kcms: Simplify directory naming

Remove "kwin", it's repetitive and doesn't add new information. In
addition to that, prefixing commits that change kcms will become more
straightforward. There's more than one scheme people use, some include
"kwin", some don't.

---

That moves the file we patch with kwin-5.21.80-gstreamer-optional.patch.  Git says:

src/{kcmkwin/kwineffects => kcms/effects}/package/contents/ui/Effect.qml

And indeed, manually editing the patch paths to that effect allows it to apply cleanly on top of upstream 0509dec92 (current HEAD) and a remerge just completed successfully.
Comment 1 Larry the Git Cow gentoo-dev 2022-12-24 23:48:04 UTC
The bug has been closed via the following commit(s):

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

commit d8b79725f6da7605bb12c02ac55df17a63041e2d
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2022-12-24 23:42:03 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2022-12-24 23:42:03 +0000

    kde-plasma/kwin: Rebase gstreamer-optional.patch onto git master
    
    Upstream commit f94b8bfa860507ff478bf056d93f71068276dbe6
    
    Thanks-to: Duncan <1i5t5.duncan@cox.net>
    Closes: https://bugs.gentoo.org/887087
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/kwin-5.26.80-gstreamer-optional.patch    | 25 ++++++++++++++++++++++
 kde-plasma/kwin/kwin-9999.ebuild                   |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)