The ebuild(s) for qtwebengine:5/5.15 have a src_prepare which looks like this: ...stuff... qt5-build_src_prepare # this calls eappy_user after applying all other patches ...apply ppc64le specific patches... ...generate ppc64le build files... This means that the ppc64le specific patches, which adds new functionality, are applied after the user patches. That is bad if the user wants to patch the functionality in question (for example by adding big endian support as well). It also increases the risk for conflicts if any patches are applied after the user patches. I suggest changing the order to ...stuff... ...apply ppc64le specific patches... qt5-build_src_prepare # this calls eappy_user after applying all other patches ...generate ppc64le build files... Note that while this does reverse the order of ppc64le specific patches and general Gentoo patches, it does not introduce any conflict. Reproducible: Always Steps to Reproduce: 1.Put a patch that modifies ppc64le specific changes in /etc/portage/patches/dev-qt/qtwebengine-5.15.10_p20230505/ 2.emerge dev-qt/qtwebengine-5.15.10_p20230505 3. Actual Results: The user patch is applied before the ppc64le specific patches, resulting in a failure to apply Expected Results: The user patch is applied after all other patches
Created attachment 865379 [details, diff] Suggested change to ebuild
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e55d393b2d0d450d3ec950770f32f9fb3e8b13 commit a7e55d393b2d0d450d3ec950770f32f9fb3e8b13 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2023-11-08 19:44:30 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2023-11-08 19:47:17 +0000 dev-qt/qtwebengine: Apply ppc64 patches after eapply_user Thanks-to: Marcus Comstedt <marcus@mc.pp.se> Closes: https://bugs.gentoo.org/910218 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/qt.git/commit/?id=6118791cd73fe2d17e693bfddecfde3011c2dcaf commit 6118791cd73fe2d17e693bfddecfde3011c2dcaf Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2023-11-08 19:44:30 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2023-11-11 20:18:46 +0000 dev-qt/qtwebengine: Apply ppc64 patches after eapply_user Thanks-to: Marcus Comstedt <marcus@mc.pp.se> Closes: https://bugs.gentoo.org/910218 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
