Created attachment 907734 [details, diff] patch to be applied on the gentoo tree I have removed all upstream fixed patches from opencascade-9999.ebuild and opencascade-7.8.1.ebuild. jemalloc-lib-type.patch and avoid-pre-stripping-binaries.patch rebased for next release version. opencascade-7.7.0-build-against-vtk-9.2.patch needed to be removed from opencascade-7.8.1.ebuild because it is fixed already upstream in releases V7_8_0 and V7_8_1 https://github.com/Open-Cascade-SAS/OCCT/commit/54ed243582970aebb8f69954311d4d94b6fc2c7e 0033372: Visualization - Compilation of git master fails against vtk 9.2.6 Fixed compilation on vtk 9.2.6. "Resolved name collisions with X11 headers" * Applying opencascade-7.7.0-build-against-vtk-9.2.patch ... patching file src/IVtkDraw/IVtkDraw_Interactor.cxx Hunk #1 succeeded at 36 with fuzz 1 (offset 9 lines).
Created attachment 911727 [details, diff] patch to be applied on the gentoo tree
(In reply to jospezial from comment #1) > Created attachment 911727 [details, diff] [details, diff] > patch to be applied on the gentoo tree Thanks for providing this, and for the explanations.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807c9b83eac163f26369e35d143bdc2c5bdac49d commit 807c9b83eac163f26369e35d143bdc2c5bdac49d Author: Sam James <sam@gentoo.org> AuthorDate: 2024-12-12 11:45:52 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-12-12 11:47:15 +0000 sci-libs/opencascade: rebase live patches, drop unnecessary patch from 7.8.1 * Rebase jemalloc-lib-type.patch and avoid-pre-stripping-binaries.patch * Drop unnecessary build-against-vtk-9.2.patch patch from 7.8.1 which was applying with fuzz, already in the 7.8.1 release Closes: https://bugs.gentoo.org/942794 Thanks-to: jospezial Signed-off-by: Sam James <sam@gentoo.org> .../opencascade-7.7.0-build-against-vtk-9.2.patch | 36 ---------------------- ...ascade-7.8.2-avoid-pre-stripping-binaries.patch | 25 +++++++++++++++ .../opencascade-7.8.2-jemalloc-lib-type.patch | 26 ++++++++++++++++ sci-libs/opencascade/opencascade-7.8.1.ebuild | 1 - sci-libs/opencascade/opencascade-9999.ebuild | 7 ++--- 5 files changed, 53 insertions(+), 42 deletions(-)