Bug 836348

Summary:	[kde overlay] kde-frameworks/extra-cmake-modules-9999 extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch needs rebased
Product:	Gentoo Linux	Reporter:	Duncan <1i5t5.duncan>
Component:	Overlays	Assignee:	Gentoo KDE team <kde>
Status:	RESOLVED FIXED
Severity:	normal
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---

Description Duncan 2022-03-29 06:24:48 UTC

In case bug and fix cross this is at kde overlay b9b63c044.

Upstream 8f43932db adds a few lines to the beginning of tests/ECMAddTests/CMakeLists.txt, invalidating the gentoo/kde extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch, which tries to add a few lines at the beginning as well.

Additionally, as you can see in the below quoted patch-application lines, extra-cmake-modules-5.49.0-no-fatal-warnings.patch is applying with a 190 line offset and fuzz 1.  Don't know whether that's worth rebasing at the same time (different commit, same push?) or just ignore that until further changes make it actually fail.

* Applying extra-cmake-modules-5.49.0-no-fatal-warnings.patch ...
patching file kde-modules/KDECompilerSettings.cmake
Hunk #1 succeeded at 534 with fuzz 1 (offset 190 lines).                                                                                                       [ ok ]
* Applying extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch ...
patching file modules/ECMAddTests.cmake
Hunk #1 succeeded at 84 (offset 3 lines).
Hunk #2 succeeded at 131 (offset 5 lines).
patching file tests/ECMAddTests/CMakeLists.txt
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file tests/ECMAddTests/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.72.0-skip-ecm_add_test-early.patch

Comment 1 Larry the Git Cow gentoo-dev

2022-03-29 10:51:12 UTC

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f2b69f3ffb3011e3c77506e98d6363379274ac6

commit 5f2b69f3ffb3011e3c77506e98d6363379274ac6
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2022-03-29 10:47:29 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2022-03-29 10:47:29 +0000

    kde-frameworks/extra-cmake-modules: Rebase skip-ecm_add_test-early.patch
    
    Reported-by: Duncan <1i5t5.duncan@cox.net>
    Closes: https://bugs.gentoo.org/836348
    Package-Manager: Portage-3.0.30, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../extra-cmake-modules-9999.ebuild                |  2 +-
 ...e-modules-5.93.0-skip-ecm_add_test-early.patch} | 39 ++++++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)