Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 750593 - [kde overlay] kde-plasma/libkscreen-9999 needs libkscreen-wrapland-support.patch rebased
Summary: [kde overlay] kde-plasma/libkscreen-9999 needs libkscreen-wrapland-support.pa...
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: 2020-10-21 19:17 UTC by Duncan
Modified: 2020-10-22 12:53 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 2020-10-21 19:17:06 UTC
Upstream libkscreen commit cad5bd707 (HEAD ATM) "Remove not implemented method" touches backends/kwayland/waylandoutput.h, removing line 72 "void showOutput();".

Unfortunately that's part of the context in RomanG's rather huge and invasive libkscreen-wrapland-support.patch, which gentoo applies, so the patch needs rebased.  Fortunately, based on the below that's the only reject in all the files it touches and the removed line is just context, so the rebase shouldn't be as horrible as it could be given size and invasiveness of the patch.

>>> Preparing source in /tmp/portage/kde-plasma/libkscreen-9999/work/libkscreen-9999 ...
* Applying libkscreen-wrapland-support.patch ...
patching file CONTRIBUTING.md
patching file backends/kwayland/CMakeLists.txt
patching file backends/kwayland/plugins/CMakeLists.txt
patching file backends/kwayland/plugins/kwayland/CMakeLists.txt
patching file backends/kwayland/plugins/kwayland/kwayland.json
patching file backends/kwayland/plugins/kwayland/kwayland_interface.cpp
patching file backends/kwayland/plugins/kwayland/kwayland_interface.h
patching file backends/kwayland/plugins/kwayland/kwayland_output.cpp
patching file backends/kwayland/plugins/kwayland/kwayland_output.h
patching file backends/kwayland/wayland_interface.cpp
patching file backends/kwayland/wayland_interface.h
patching file backends/kwayland/waylandbackend.cpp
patching file backends/kwayland/waylandbackend.h
patching file backends/kwayland/waylandconfig.cpp
patching file backends/kwayland/waylandconfig.h
patching file backends/kwayland/waylandoutput.cpp
patching file backends/kwayland/waylandoutput.h
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file backends/kwayland/waylandoutput.h.rej
patching file backends/kwayland/waylandscreen.cpp
patching file backends/kwayland/plugins/CMakeLists.txt
patching file backends/kwayland/plugins/wrapland/CMakeLists.txt
patching file backends/kwayland/plugins/wrapland/wrapland.json
patching file backends/kwayland/plugins/wrapland/wrapland_interface.cpp
patching file backends/kwayland/plugins/wrapland/wrapland_interface.h
patching file backends/kwayland/plugins/wrapland/wrapland_output.cpp
patching file backends/kwayland/plugins/wrapland/wrapland_output.h
patching file backends/kwayland/wayland_interface.cpp
patching file backends/kwayland/wayland_interface.h
patching file backends/kwayland/plugins/CMakeLists.txt
patching file backends/kwayland/plugins/wrapland-wlr/CMakeLists.txt
patching file backends/kwayland/plugins/wrapland-wlr/wrapland-wlr.json
patching file backends/kwayland/plugins/wrapland-wlr/wrapland_interface.cpp
patching file backends/kwayland/plugins/wrapland-wlr/wrapland_interface.h
patching file backends/kwayland/plugins/wrapland-wlr/wrapland_output.cpp
patching file backends/kwayland/plugins/wrapland-wlr/wrapland_output.h                                                                              [ !! ]
* ERROR: kde-plasma/libkscreen-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-plasma/libkscreen-9999/work/libkscreen-wrapland-support.patch
Comment 1 Larry the Git Cow gentoo-dev 2020-10-21 21:09:51 UTC
The bug has been closed via the following commit(s):

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

commit 99b81f791930f6a423e4aecf7517bbd1f1e43dac
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-10-21 21:08:34 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-10-21 21:09:36 +0000

    kde-plasma/plasma-meta: Drop kwinft support
    
    Closes: https://bugs.gentoo.org/750593
    Package-Manager: Portage-3.0.8, Repoman-3.0.2
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-plasma/plasma-meta/metadata.xml            | 1 -
 kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

Additionally, it has been referenced in the following commit(s):

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

commit 57351beebbd4c494d3bb392969da89f2b9b1c2a8
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-10-21 21:06:58 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-10-21 21:06:58 +0000

    kde-plasma/plasma-desktop: Drop kwinft support
    
    Bug: https://bugs.gentoo.org/750593
    Package-Manager: Portage-3.0.8, Repoman-3.0.2
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

commit 3716bc2457b8ad508c24ab68c7a741dfae9892fd
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-10-21 21:06:23 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-10-21 21:06:23 +0000

    kde-plasma/plasma-workspace: Drop kwinft support
    
    Bug: https://bugs.gentoo.org/750593
    Package-Manager: Portage-3.0.8, Repoman-3.0.2
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

commit 0850fe59336217afb0ad1f7d732385b1988ea249
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-10-21 21:05:36 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-10-21 21:05:36 +0000

    kde-plasma/libkscreen: Drop kwinft support
    
    Bug: https://bugs.gentoo.org/750593
    Package-Manager: Portage-3.0.8, Repoman-3.0.2
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-plasma/libkscreen/Manifest               |  1 -
 kde-plasma/libkscreen/libkscreen-9999.ebuild | 14 +-------------
 kde-plasma/libkscreen/metadata.xml           |  3 ---
 3 files changed, 1 insertion(+), 17 deletions(-)