It is no more required to apply patch freecad-9999-Add-memory-header-for-std-shared_ptr.patch as the Freecad git repository has integrated the same bugfix. Reproducible: Always Steps to Reproduce: 1. Unmask freecad-9999 2. emerge -v freecad Actual Results: >>> Emerging (1 of 1) media-gfx/freecad-9999::gentoo * Checking for at least 2 GiB disk space at "/var/tmp/portage/media-gfx/freecad-9999/temp" ... [ ok ] * Using python3.9 to build >>> Unpacking source... * Repository id: FreeCAD_FreeCAD.git * To override fetched repository properties, use: * EGIT_OVERRIDE_REPO_FREECAD_FREECAD * EGIT_OVERRIDE_BRANCH_FREECAD_FREECAD * EGIT_OVERRIDE_COMMIT_FREECAD_FREECAD * EGIT_OVERRIDE_COMMIT_DATE_FREECAD_FREECAD * * Fetching https://github.com/FreeCAD/FreeCAD.git ... git fetch https://github.com/FreeCAD/FreeCAD.git +HEAD:refs/git-r3/HEAD git symbolic-ref refs/git-r3/media-gfx/freecad/0/__main__ refs/git-r3/HEAD * Checking out https://github.com/FreeCAD/FreeCAD.git to /var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999 ... git checkout --quiet refs/git-r3/HEAD GIT update --> repository: https://github.com/FreeCAD/FreeCAD.git at the commit: 7ca80cade00f191b2482c91256636c58c9bc0369 >>> Source unpacked in /var/tmp/portage/media-gfx/freecad-9999/work >>> Preparing source in /var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999 ... * Source directory (CMAKE_USE_DIR): "/var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999" * Build directory (BUILD_DIR): "/var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999_build" * Applying freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch ... [ ok ] * Applying freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch ... [ ok ] * Applying freecad-9999-Add-memory-header-for-std-shared_ptr.patch ... patching file src/App/Metadata.h Hunk #1 FAILED at 30. Hunk #2 succeeded at 297 (offset 1 line). 1 out of 2 hunks FAILED -- saving rejects to file src/App/Metadata.h.rej [ !! ] * ERROR: media-gfx/freecad-9999::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch * * Call stack: * ebuild.sh, line 127: Called src_prepare * environment, line 3932: Called cmake_src_prepare * environment, line 1891: Called default_src_prepare * phase-functions.sh, line 934: Called __eapi8_src_prepare * environment, line 507: Called eapply '--' '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch' '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch' '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch' * environment, line 2051: Called _eapply_patch '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch' * environment, line 1989: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=media-gfx/freecad-9999::gentoo'`, * the complete build log and the output of `emerge -pqv '=media-gfx/freecad-9999::gentoo'`. * The complete build log is located at '/var/tmp/portage/media-gfx/freecad-9999/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/media-gfx/freecad-9999/temp/environment'. * Working directory: '/var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999' * S: '/var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999' >>> Failed to emerge media-gfx/freecad-9999, Log file: >>> '/var/tmp/portage/media-gfx/freecad-9999/temp/build.log' * Messages for package media-gfx/freecad-9999: * ERROR: media-gfx/freecad-9999::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch * * Call stack: * ebuild.sh, line 127: Called src_prepare * environment, line 3932: Called cmake_src_prepare * environment, line 1891: Called default_src_prepare * phase-functions.sh, line 934: Called __eapi8_src_prepare * environment, line 507: Called eapply '--' '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch' '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch' '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch' * environment, line 2051: Called _eapply_patch '/var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch' * environment, line 1989: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/media-gfx/freecad-9999/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=media-gfx/freecad-9999::gentoo'`, * the complete build log and the output of `emerge -pqv '=media-gfx/freecad-9999::gentoo'`. * The complete build log is located at '/var/tmp/portage/media-gfx/freecad-9999/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/media-gfx/freecad-9999/temp/environment'. * Working directory: '/var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999' * S: '/var/tmp/portage/media-gfx/freecad-9999/work/freecad-9999' Removing the patch from the patches list works.
Thanks for the hint. A PR is being prepared.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c53e3e86537e972bea3fcc51d83edee653e3f2 commit e6c53e3e86537e972bea3fcc51d83edee653e3f2 Author: Bernd Waibel <waebbl-gentoo@posteo.net> AuthorDate: 2021-11-20 01:14:41 +0000 Commit: Joonas Niilola <juippis@gentoo.org> CommitDate: 2021-11-30 12:50:18 +0000 media-gfx/freecad: remove obsolete patch - fix some dependencies - simplify opencascade related code, which has been obsoleted due to removal of slot 7.4.0 - use default CMAKE_INSTALL_PREFIX (/usr) instead of /usr/$(get_libdir)/${PN}. This leads to some files being installed in /usr/{Ext,Mod}. A new patch fixes this. The lower case symlinks for the executables are no longer installed now, as the binaries are in the path and can be called directly. - use relative patchs for CMAKE_INSTALL_* variables Closes: https://bugs.gentoo.org/824550 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Signed-off-by: Joonas Niilola <juippis@gentoo.org> media-gfx/freecad/Manifest | 1 + media-gfx/freecad/freecad-9999.ebuild | 81 +++++++++++++++-------------------- 2 files changed, 36 insertions(+), 46 deletions(-)
