Created attachment 602516 [details, diff] gmic-2.8.1-qt-cmake.patch patch gmic-2.7.1-qt-cmake.patch do not apply but it seem to only be a problem of --strip=num (-p) attaching patch rebased on 2.8.1. Also, maybe it's possible to run the code inside the `if use gimp || use krita || use qt5; then` block unconditionally Hunk #4 succeeded at 327 (offset -1 lines). Hunk #5 succeeded at 357 (offset -1 lines). patching file gmic-qt/CMakeLists.txt Hunk #1 succeeded at 30 with fuzz 1. Hunk #2 succeeded at 153 (offset 3 lines). Hunk #3 succeeded at 193 (offset 3 lines). [ ok ] * Working in BUILD_DIR: "/var/tmp/portage/media-gfx/gmic-2.8.1/work/gmic-2.8.1_build" * Hardcoded definition(s) removed in CMakeLists.txt: * set(CMAKE_BUILD_TYPE Release) * Hardcoded definition(s) removed in gmic-qt/CMakeLists.txt: * set(CMAKE_BUILD_TYPE "Release") * Applying gmic-2.7.1-qt-cmake.patch ... patching file CMakeLists.txt Hunk #1 FAILED at 13. Hunk #2 FAILED at 145. Hunk #3 FAILED at 187. 3 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej [ !! ] * ERROR: media-gfx/gmic-2.8.1::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/media-gfx/gmic-2.8.1/files/gmic-2.7.1-qt-cmake.patch * * Call stack: * ebuild.sh, line 125: Called src_prepare * environment, line 2134: Called cmake_src_prepare * environment, line 966: Called default_src_prepare * phase-functions.sh, line 920: Called __eapi6_src_prepare * environment, line 325: Called eapply '/var/tmp/portage/media-gfx/gmic-2.8.1/files/gmic-2.7.1-qt-cmake.patch' * environment, line 1124: Called _eapply_patch '/var/tmp/portage/media-gfx/gmic-2.8.1/files/gmic-2.7.1-qt-cmake.patch' * environment, line 1062: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/media-gfx/gmic-2.8.1/files/gmic-2.7.1-qt-cmake.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/gmic-2.8.1::gentoo'`, * the complete build log and the output of `emerge -pqv '=media-gfx/gmic-2.8.1::gentoo'`. * The complete build log is located at '/var/log/portage/build/media-gfx/gmic-2.8.1:20200104-080944.log.gz'. * The ebuild environment file is located at '/var/tmp/portage/media-gfx/gmic-2.8.1/temp/environment'. * Working directory: '/var/tmp/portage/media-gfx/gmic-2.8.1/work/gmic-2.8.1' * S: '/var/tmp/portage/media-gfx/gmic-2.8.1/work/gmic-2.8.1'
Please note that the original change in cmake.eclass causing bug 704524 was reverted and I did not catch the error in gmic-2.8.1 despite testing because of a local override.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f729e094640deb8bc7d0cb5662bbb3b1d2a851 commit 35f729e094640deb8bc7d0cb5662bbb3b1d2a851 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-01-04 09:55:17 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-01-04 09:56:08 +0000 media-gfx/gmic: Use src_prepare from 2.7.2 again cmake.eclass was fixed instead, until a better solution is found. Closes: https://bugs.gentoo.org/704758 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> media-gfx/gmic/gmic-2.8.1.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
