The patch qtwebengine-5.9.3-paxmark-mksnapshot.patch fails to apply to qtwebengine-5.11.1. The error message gentoo /usr/portage/dev-qt/qtwebengine/files # emerge -1av qtwebengine These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild U ] dev-qt/qtwebengine-5.11.1:5/5.11::gentoo [5.9.6-r1:5/5.9::gentoo] USE="alsa pax_kernel pulseaudio system-ffmpeg system-icu widgets -bindist -debug -designer -geolocation -test" 0 KiB Total: 1 package (1 upgrade), Size of downloads: 0 KiB Would you like to merge these packages? [Yes/No] y >>> Verifying ebuild manifests >>> Emerging (1 of 1) dev-qt/qtwebengine-5.11.1::gentoo * qtwebengine-everywhere-src-5.11.1.tar.xz BLAKE2B SHA512 size ;-) ... [ ok ] >>> Unpacking source... >>> Unpacking qtwebengine-everywhere-src-5.11.1.tar.xz to /var/tmp/portage/dev-qt/qtwebengine-5.11.1/work >>> Source unpacked in /var/tmp/portage/dev-qt/qtwebengine-5.11.1/work >>> Preparing source in /var/tmp/portage/dev-qt/qtwebengine-5.11.1/work/qtwebengine-everywhere-src-5.11.1 ... * Applying qtwebengine-5.9.3-paxmark-mksnapshot.patch ... 1 out of 2 hunks FAILED -- saving rejects to file src/3rdparty/chromium/v8/BUIL [ !! ]j * ERROR: dev-qt/qtwebengine-5.11.1::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch * * Call stack: * ebuild.sh, line 124: Called src_prepare * environment, line 3975: Called qt5-build_src_prepare * environment, line 3556: Called default * phase-functions.sh, line 868: Called default_src_prepare * phase-functions.sh, line 933: Called __eapi6_src_prepare * environment, line 364: Called eapply '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch' '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.9.6-gcc8.patch' '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch' '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.11.1-ffmpeg4.patch' '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch' '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch' * environment, line 1054: Called _eapply_patch '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch' * environment, line 992: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/dev-qt/qtwebengine-5.11.1/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch' * isolated-functions.sh, line 121: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=dev-qt/qtwebengine-5.11.1::gentoo'`, * the complete build log and the output of `emerge -pqv '=dev-qt/qtwebengine-5.11.1::gentoo'`. * The complete build log is located at '/var/log/portage/build/dev-qt/qtwebengine-5.11.1:20181110-185640.log'. * For convenience, a symlink to the build log is located at '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/temp/environment'. * Working directory: '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/work/qtwebengine-everywhere-src-5.11.1' * S: '/var/tmp/portage/dev-qt/qtwebengine-5.11.1/work/qtwebengine-everywhere-src-5.11.1' >>> Failed to emerge dev-qt/qtwebengine-5.11.1, Log file: >>> '/var/log/portage/build/dev-qt/qtwebengine-5.11.1:20181110-185640.log'
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07df47de4fba65ea226811b9b6f586290cf7035c commit 07df47de4fba65ea226811b9b6f586290cf7035c Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2018-11-10 19:50:52 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2018-11-10 20:27:01 +0000 dev-qt/qtwebengine: Update paxmark-mksnapshot patches for 5.11.{1,2} Reported-by: Han <jkmls@outlook.com> Thanks-to: Attila Tóth <atoth@atoth.sote.hu> Thanks-to: Miroslaw Mieszczak <gentoo@mieszczak.com.pl> Closes: https://bugs.gentoo.org/670852 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../qtwebengine-5.11.1-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ .../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild | 2 +- 4 files changed, 84 insertions(+), 2 deletions(-)
confirmed the patch works.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/proj/qt.git/commit/?id=37f8becb08996226dd1e0a0bfaf4bd67e7418629 commit 37f8becb08996226dd1e0a0bfaf4bd67e7418629 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2018-11-13 17:16:36 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2018-11-13 17:17:23 +0000 dev-qt/qtwebengine: Update paxmark-mksnapshot patch Reported-by: Han <jkmls@outlook.com> Thanks-to: Attila Tóth <atoth@atoth.sote.hu> Thanks-to: Miroslaw Mieszczak <gentoo@mieszczak.com.pl> Bug: https://bugs.gentoo.org/670852 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +- 4 files changed, 44 insertions(+), 3 deletions(-)
