Upstream (despammed emails)... commit 21158fbc37e9b723b47a0fa74e968d553d0d6aba (HEAD, master) Author: Volker Krause <vkrause@> AuthorDate: Thu Oct 3 14:29:30 2024 +0200 Commit: Christoph Cullmann <christoph@> CommitDate: Fri Oct 11 17:02:53 2024 +0000 Remove the old/unused SIP-based Python binding generation infrastructure ... removes the code that our extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch disables, so our patch no longer applies and the patch can be disabled for -9999. The commit notes mention replacing the old/unused bindings removed with !450, which I didn't look up, so it's possible we'll need to either apply a new patch or adjust our invocations for it instead when it hits (if it hasn't already). While killing that patch you may wish to rebase extra-cmake-modules-5.49.0-no-fatal-warnings.patch too, given the fuzz 2 below. >>> Preparing source in /tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999 ... * Source directory (CMAKE_USE_DIR): "/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999" * Build directory (BUILD_DIR): "/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999_build" * Applying extra-cmake-modules-5.49.0-no-fatal-warnings.patch ... patching file kde-modules/KDECompilerSettings.cmake Hunk #1 succeeded at 546 with fuzz 2 (offset 202 lines). [ ok ] * Applying extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch ... [ ok ] * Applying extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch ... patching file tests/CMakeLists.txt Hunk #1 FAILED at 79. 1 out of 1 hunk FAILED -- saving rejects to file tests/CMakeLists.txt.rej [ !! ] * ERROR: kde-frameworks/extra-cmake-modules-9999::kde failed (prepare phase): * patch -p1 failed with /tmp/portage/kde-frameworks/extra-cmake-modules-9999/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecdf416ff9cbf4461ebff3c7573e24f0551bbbfc commit ecdf416ff9cbf4461ebff3c7573e24f0551bbbfc Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2024-10-12 12:00:43 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2024-10-12 12:00:43 +0000 kde-frameworks/extra-cmake-modules: Drop obsolete patch Upstream commit 21158fbc37e9b723b47a0fa74e968d553d0d6aba Closes: https://bugs.gentoo.org/941381 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../extra-cmake-modules-9999.ebuild | 1 - ...les-5.112.0-disable-tests-requiring-PyQt5.patch | 27 ---------------------- 2 files changed, 28 deletions(-)
Thanks for your report. (In reply to Duncan from comment #0) > While killing that patch you may wish to rebase > extra-cmake-modules-5.49.0-no-fatal-warnings.patch too, given the fuzz 2 > below. Not enough fuzz for the churn. ;)
