Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 847298 - [qt-overlay] dev-qt/qtwebengine-5.15.4.9999: patch -p1 failed with /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch
Summary: [qt-overlay] dev-qt/qtwebengine-5.15.4.9999: patch -p1 failed with /tmp/port...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Qt Bug Alias
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-05-25 00:05 UTC by Perfect Gentleman
Modified: 2022-06-18 14:27 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Perfect Gentleman 2022-05-25 00:05:14 UTC
[ebuild   R   *] dev-qt/qtwebengine-5.15.4.9999:5/5.15::qt  USE="alsa jumbo-build screencast system-ffmpeg system-icu widgets -bindist -debug -designer -geolocation -kerberos -pulseaudio -test" 0 KiB

Total: 1 package (1 reinstall), Size of downloads: 0 KiB

Would you like to merge these packages? [Yes/No] 

>>> Verifying ebuild manifests

>>> Running pre-merge checks for dev-qt/qtwebengine-5.15.4.9999
 * Checking for at least 13 GiB RAM ...                                                                                                             [ ok ]
 * Checking for at least 7 GiB disk space at "/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp" ...                                                 [ ok ]
 * Checking for at least 150 MiB disk space at "/usr" ...                                                                                           [ ok ]

>>> Emerging (1 of 1) dev-qt/qtwebengine-5.15.4.9999::qt
 * qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 BLAKE2B SHA512 size ;-) ...                                                                   [ ok ]
 * qtwebengine-5.15.3_p20220406-patchset.tar.xz BLAKE2B SHA512 size ;-) ...                                                                         [ ok ]
 * Checking for at least 13 GiB RAM ...                                                                                                             [ ok ]
 * Checking for at least 7 GiB disk space at "/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp" ...                                                 [ ok ]
 * Checking for at least 150 MiB disk space at "/usr" ...                                                                                           [ ok ]
 * Checking whether python3_10 is suitable ...
 *   >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ...                                                                                                [ ok ]
 * Using python3.10 to build (via PYTHON_COMPAT iteration)
>>> Unpacking source...
 * Repository id: qt_qtwebengine.git
 * To override fetched repository properties, use:
 *   EGIT_OVERRIDE_REPO_QT_QTWEBENGINE
 *   EGIT_OVERRIDE_BRANCH_QT_QTWEBENGINE
 *   EGIT_OVERRIDE_COMMIT_QT_QTWEBENGINE
 *   EGIT_OVERRIDE_COMMIT_DATE_QT_QTWEBENGINE
 * 
 * Fetching https://code.qt.io/qt/qtwebengine.git ...
git fetch https://code.qt.io/qt/qtwebengine.git +refs/heads/5.15:refs/heads/5.15
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 9 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (9/9), 1.01 KiB | 206.00 KiB/s, done.
From https://code.qt.io/qt/qtwebengine
   a90f994c..8dea0e3b  5.15       -> 5.15
git symbolic-ref refs/git-r3/dev-qt/qtwebengine/5/__main__ refs/heads/5.15
 * Repository id: qt_qtwebengine-chromium.git
 * To override fetched repository properties, use:
 *   EGIT_OVERRIDE_REPO_QT_QTWEBENGINE_CHROMIUM
 *   EGIT_OVERRIDE_BRANCH_QT_QTWEBENGINE_CHROMIUM
 *   EGIT_OVERRIDE_COMMIT_QT_QTWEBENGINE_CHROMIUM
 *   EGIT_OVERRIDE_COMMIT_DATE_QT_QTWEBENGINE_CHROMIUM
 * 
 * Fetching https://code.qt.io/qt/qtwebengine-chromium.git ...
git fetch https://code.qt.io/qt/qtwebengine-chromium.git --prune +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/* +refs/notes/*:refs/notes/* +refs/pull/*/head:refs/pull/* +HEAD:refs/git-r3/HEAD
remote: Counting objects: 535, done.
remote: Compressing objects: 100% (508/508), done.
remote: Total 535 (delta 472), reused 34 (delta 26)
Receiving objects: 100% (535/535), 96.93 KiB | 894.00 KiB/s, done.
Resolving deltas: 100% (472/472), completed with 265 local objects.
From https://code.qt.io/qt/qtwebengine-chromium
   0d984c7f044..7857ff290ab  87-based   -> 87-based
   43329f9d7f3..3e8444fbf85  90-based   -> 90-based
   54abf184e00..660d61d9f18  94-based   -> 94-based
   59172aa4ad1..6559e00a366  98-based   -> 98-based
git update-ref --no-deref refs/git-r3/dev-qt/qtwebengine/5/src_3rdparty/__main__ 0d984c7f044a08975088191f92ecc9bc62424b14
 * Checking out https://code.qt.io/qt/qtwebengine.git to /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999 ...
git checkout --quiet 5.15
GIT update -->
   repository:               https://code.qt.io/qt/qtwebengine.git
   updating from commit:     a90f994c5d1e3edeafa8dc8048fe7c6a74aead1a
   to commit:                8dea0e3b7fec3d0bc3d496694c5c4d69c5c8e7a8
 src/core/ozone/gl_surface_egl_qt.cpp |  4 ++--
 src/core/ozone/gl_surface_glx_qt.cpp | 12 ++++++------
 src/core/ozone/gl_surface_qt.cpp     |  4 ++--
 src/core/ozone/gl_surface_qt.h       |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)
 * Checking out https://code.qt.io/qt/qtwebengine-chromium.git to /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999/src/3rdparty ...
git checkout --quiet 0d984c7f044a08975088191f92ecc9bc62424b14
GIT update -->
   repository:               https://code.qt.io/qt/qtwebengine-chromium.git
   at the commit:            0d984c7f044a08975088191f92ecc9bc62424b14
>>> Unpacking qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 to /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work
>>> Unpacking qtwebengine-5.15.3_p20220406-patchset.tar.xz to /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work
>>> Source unpacked in /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work
>>> Preparing source in /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999 ...
 * Applying qtwebengine-5.15.2_p20210521-clang-libc++.patch ...                                                                                     [ ok ]
 * Applying qtwebengine-5.15.3_p20220406-ffmpeg5.patch ...                                                                                          [ ok ]
 * Applying qtwebengine-5.15.2-disable-fatal-warnings.patch ...                                                                                     [ ok ]
 * Applying qtwebengine-5.15.2-extra_gn.patch ...
patching file src/core/gn_run.pro
Hunk #1 FAILED at 38.
1 out of 1 hunk FAILED -- saving rejects to file src/core/gn_run.pro.rej                                                                            [ !! ]
 * ERROR: dev-qt/qtwebengine-5.15.4.9999::qt failed (prepare phase):
 *   patch -p1  failed with /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 3938:  Called qt5-build_src_prepare
 *             environment, line 3491:  Called default
 *      phase-functions.sh, line  858:  Called default_src_prepare
 *      phase-functions.sh, line  934:  Called __eapi8_src_prepare
 *             environment, line  473:  Called eapply '--' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-disable-fatal-warnings.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2_p20210224-disable-git.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.3_p20220329-clang14.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.2_p20211019-jumbo-build.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.3_p20220406-patchset'
 *             environment, line 1706:  Called _eapply_patch '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch'
 *             environment, line 1644:  Called __helpers_die 'patch -p1  failed with /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 * 
 * If you need support, post the output of `emerge --info '=dev-qt/qtwebengine-5.15.4.9999::qt'`,
 * the complete build log and the output of `emerge -pqv '=dev-qt/qtwebengine-5.15.4.9999::qt'`.
 * The complete build log is located at '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp/build.log'.
 * The ebuild environment file is located at '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp/environment'.
 * Working directory: '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999'
 * S: '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999'

>>> Failed to emerge dev-qt/qtwebengine-5.15.4.9999, Log file:

>>>  '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp/build.log'

 * Messages for package dev-qt/qtwebengine-5.15.4.9999:

 * ERROR: dev-qt/qtwebengine-5.15.4.9999::qt failed (prepare phase):
 *   patch -p1  failed with /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 3938:  Called qt5-build_src_prepare
 *             environment, line 3491:  Called default
 *      phase-functions.sh, line  858:  Called default_src_prepare
 *      phase-functions.sh, line  934:  Called __eapi8_src_prepare
 *             environment, line  473:  Called eapply '--' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-disable-fatal-warnings.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2_p20210224-disable-git.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.3_p20220329-clang14.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.2_p20211019-jumbo-build.patch' '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.3_p20220406-patchset'
 *             environment, line 1706:  Called _eapply_patch '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch'
 *             environment, line 1644:  Called __helpers_die 'patch -p1  failed with /tmp/portage/dev-qt/qtwebengine-5.15.4.9999/files/qtwebengine-5.15.2-extra_gn.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 * 
 * If you need support, post the output of `emerge --info '=dev-qt/qtwebengine-5.15.4.9999::qt'`,
 * the complete build log and the output of `emerge -pqv '=dev-qt/qtwebengine-5.15.4.9999::qt'`.
 * The complete build log is located at '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp/build.log'.
 * The ebuild environment file is located at '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp/environment'.
 * Working directory: '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999'
 * S: '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/work/qtwebengine-5.15.4.9999'
 * 
 * The following package has failed to build, install, or execute postinst:
 * 
 *  (dev-qt/qtwebengine-5.15.4.9999:5/5.15::qt, ebuild scheduled for merge), Log file:
 *   '/tmp/portage/dev-qt/qtwebengine-5.15.4.9999/temp/build.log'


Reproducible: Always

Actual Results:  
patch failed

Expected Results:  
patch applied
Comment 1 Larry the Git Cow gentoo-dev 2022-06-18 14:27:24 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/qt.git/commit/?id=2223eef5da0d0a43c39eedc8c9be4d6dfd8d3ca9

commit 2223eef5da0d0a43c39eedc8c9be4d6dfd8d3ca9
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2022-05-26 19:34:05 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2022-06-18 14:26:46 +0000

    dev-qt/qtwebengine: Sync with 5.15.4_p20220526::gentoo
    
    Fix build with GCC 12
    
    Bug: https://bugs.gentoo.org/840326
    Closes: https://bugs.gentoo.org/847298
    Signed-off-by: Sam James <sam@gentoo.org>
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 ...webengine-5.15.3_p20220406-gcc12-includes.patch | 32 ++++++++++++++++++++++
 .../qtwebengine-5.15.3_p20220505-extra-gn.patch    | 10 +++++++
 dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild  |  7 +++--
 3 files changed, 46 insertions(+), 3 deletions(-)