Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 761793 - [kde overlay] kde-plasma/milou-9999 milou-5.19.80-disable-manual-tests.patch fails
Summary: [kde overlay] kde-plasma/milou-9999 milou-5.19.80-disable-manual-tests.patch ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL: https://invent.kde.org/plasma/milou/-...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-12-26 19:22 UTC by Duncan
Modified: 2020-12-26 19:26 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Duncan 2020-12-26 19:22:40 UTC
This is a followup to bug #732584 which was filed (by me) and fixed (in 1353db8f3) back in mid July (2020).

Seems upstream milou f86f87e65 (current head) finally got with the testing's-supposed-to-be-optional program and now gentoo/kde's milou-5.19.80-disable-manual-tests.patch (fix for that bug) no longer applies:

* Applying milou-5.19.80-disable-manual-tests.patch ...
patching file lib/CMakeLists.txt
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file lib/CMakeLists.txt.rej                                                                                   [ !! ]
* ERROR: kde-plasma/milou-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-plasma/milou-9999/files/milou-5.19.80-disable-manual-tests.patch


However, the patches aren't directly equivalent (a reread of the previous bug suggests gentoo handled the general test logic without a patch and the patch took care of an exception gentoo's general approach didn't handle) and I don't know enough about how it all works to tell if gentoo's patch can simply be dropped now, or if something modified to deal with the new upstream code must still be applied.

I did however test simply commenting out the patch in the ebuild and milou remerged fine with USE=-test, suggesting any problems with just dropping the patch are likely to be on the USE=test side.
Comment 1 Andreas Sturmlechner gentoo-dev 2020-12-26 19:25:47 UTC
Thanks for reporting.
Comment 2 Larry the Git Cow gentoo-dev 2020-12-26 19:26:24 UTC
The bug has been closed via the following commit(s):

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

commit b48a9d4fff5e159d172e9e539da2864fd3dcc6aa
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-12-26 19:26:04 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-12-26 19:26:04 +0000

    kde-plasma/milou: Drop obsolete patch, set ECM_TEST=true
    
    Closes: https://bugs.gentoo.org/761793
    Package-Manager: Portage-3.0.12, Repoman-3.0.2
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-plasma/milou/milou-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)