Same patch-rebase song, new verse. kdelibs4support is failing to apply kdelibs4support-5.77.0-no-kdesignerplugin.patch now. >>> Preparing source in /tmp/portage/kde-frameworks/kdelibs4support-9999/work/kdelibs4support-9999 ... * Applying kdelibs4support-5.77.0-no-kdesignerplugin.patch ... patching file CMakeLists.txt patching file KF5KDELibs4SupportConfig.cmake.in patching file cmake/modules/FindKDE4Internal.cmake patching file cmake/modules/KDE4Macros.cmake patching file src/CMakeLists.txt patching file src/KDEUIMacros.cmake patching file CMakeLists.txt Hunk #1 FAILED at 20. 1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej patching file cmake/modules/ECMQt4To5Porting.cmake patching file cmake/modules/FindQt5Transitional.cmake [ !! ] * ERROR: kde-frameworks/kdelibs4support-9999::kde failed (prepare phase): * patch -p1 failed with /tmp/portage/kde-frameworks/kdelibs4support-9999/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch There's only one upstream commit since I last upgraded so it's the culprit, 063e3332f "GIT_SILENT Upgrade Qt5 version requirement to 5.14.0." All it touches is CMakeLists.txt, one line inserted one deleted, so the fix is easy: On our patch, line 165: s/REQUIRED_QT_VERSION 5.13.0/REQUIRED_QT_VERSION 5.14.0/ As a more general solution, could that chunk be removed from the patch and a sed used in the ebuild instead? That would prevent the frequent upstream version-bumps from interfering with the context, and the rest of the patch could remain as a patch, still dying on failure to apply when the actual code-context changes. (Or is it supposed to be eliminated within a couple versions anyway, making it possibly not worth the trouble? FWIW I only have plasma-workspace and plasma-desktop still depping on it here, but an equery d -a says there's quite a few more than that in-tree. But kdelibs4support itself could be frozen well before the deps on it are killed.)
Thanks for reporting, yes this quick succession of Qt minimum version bumps was out of schedule: https://mail.kde.org/pipermail/distributions/2020-December/000894.html It will only happen exactly one more time in roughly 6 months from now, to Qt 5.15, the last iteration of Qt5.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=e36ce6576c16630918df818fddefc73b5d1183a1 commit e36ce6576c16630918df818fddefc73b5d1183a1 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-12-19 23:13:43 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-12-19 23:14:20 +0000 kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/760741 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ...gnerplugin.patch => kdelibs4support-5.78.0-no-kdesignerplugin.patch} | 2 +- kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
