Upstream commit c881bae5b "Mark QtConcurrent for moving to the private link interface in KF6" adds the mentioned qt6 TODO to the existing comment at the end of the line in src/core/CMakeLists.txt that our patch tries to move down a few lines so it's under PRIVATE, making our patch fail. At the previous upstream commit (13dab6a91) our patch still applies fine. So our patch needs rebased. >>> Preparing source in /tmp/portage/kde-frameworks/kio-9999/work/kio-9999 ... * Applying kio-5.81.0-fix-qtconcurrent-private-link.patch ... patching file KF5KIOConfig.cmake.in patching file src/core/CMakeLists.txt Hunk #1 FAILED at 188. 1 out of 1 hunk FAILED -- saving rejects to file src/core/CMakeLists.txt.rej [ !! ] * ERROR: kde-frameworks/kio-9999::kde failed (prepare phase): * patch -p1 failed with /tmp/portage/kde-frameworks/kio-9999/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6ea63eb367b1da7f3461b441580ac38d841bb78 commit d6ea63eb367b1da7f3461b441580ac38d841bb78 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2021-06-30 06:06:30 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-06-30 06:06:30 +0000 kde-frameworks/kio: Rebase fix-qtconcurrent-private-link.patch Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/799215 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ... => kio-5.84.0-fix-qtconcurrent-private-link.patch} | 18 +++++++++++------- kde-frameworks/kio/kio-9999.ebuild | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-)
