On kde overlay commit 78d484ded Upstream discover commit 0f7b3efe1 kills our patch on CMakeLists.txt first hunk. The find_package(Qt5 ...) ... line we modify is changed to ... find_package(Qt${QT_MAJOR_VERSION} ...) ... and moved down a few lines, out of our hunk #1 context and into our hunk #2 context with some additional QT_MAJOR_VERSION logic added (but our hunk #2 still succeeds with fuzz). The error as it appears in the ebuild output: * Applying discover-5.21.90-tests-optional.patch ... patching file CMakeLists.txt Hunk #1 FAILED at 11. Hunk #2 succeeded at 30 with fuzz 2 (offset 7 lines). 1 out of 2 hunks FAILED -- saving rejects to file CMakeLists.txt.rej patching file libdiscover/CMakeLists.txt patching file libdiscover/backends/DummyBackend/CMakeLists.txt patching file libdiscover/backends/FlatpakBackend/CMakeLists.txt patching file libdiscover/backends/KNSBackend/CMakeLists.txt [ !! ] * ERROR: kde-plasma/discover-9999::kde failed (prepare phase): * patch -p1 failed with /tmp/portage/kde-plasma/discover-9999/files/discover-5.21.90-tests-optional.patch
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b49f48d5f32e2af6061820f90cbd450535410c3 commit 3b49f48d5f32e2af6061820f90cbd450535410c3 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2022-03-07 16:53:40 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2022-03-07 16:53:40 +0000 kde-plasma/discover: Rebase tests-optional.patch Closes: https://bugs.gentoo.org/834691 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-plasma/discover/discover-9999.ebuild | 2 +- .../files/discover-5.24.90-tests-optional.patch | 94 ++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-)
