Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 889780 - [qt overlay] dev-qt/*-5.15.8.9999: * patch -p1 failed with /tmp/portage/dev-qt/qtdbus-5.15.8.9999/work/qtbase-5.15-gentoo-patchset-2/0003-Use-link-option-pthread-instead-of-lpthread.patch
Summary: [qt overlay] dev-qt/*-5.15.8.9999: * patch -p1 failed with /tmp/portage/d...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Qt Bug Alias
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-01-05 06:25 UTC by Perfect Gentleman
Modified: 2023-01-08 14:38 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 2023-01-05 06:25:27 UTC
* Applying patches from /tmp/portage/dev-qt/qtdbus-5.15.8.9999/work/qtbase-5.15-gentoo-patchset-2 ...
 *   0001-Fix-build-with-CXXFLAGS-march-native.patch ...                                                                                              [ ok ]
 *   0002-Use-pkgconfig-in-order-to-find-mysql-configuration.patch ...                                                                                [ ok ]
 *   0003-Use-link-option-pthread-instead-of-lpthread.patch ...
patching file mkspecs/common/linux.conf
patching file src/corelib/configure.json
Hunk #1 FAILED at 355.
1 out of 2 hunks FAILED -- saving rejects to file src/corelib/configure.json.rej                                                                      [ !! ]
 * ERROR: dev-qt/qtdbus-5.15.8.9999::qt failed (prepare phase):
 *   patch -p1  failed with /tmp/portage/dev-qt/qtdbus-5.15.8.9999/work/qtbase-5.15-gentoo-patchset-2/0003-Use-link-option-pthread-instead-of-lpthread.patch
 * 
 * Call stack:
 *               ebuild.sh, line  136:  Called src_prepare
 *             environment, line 2775:  Called qt5-build_src_prepare
 *             environment, line 2368:  Called eapply '/tmp/portage/dev-qt/qtdbus-5.15.8.9999/work/qtbase-5.15-gentoo-patchset-2'
 *             environment, line 1023:  Called _eapply_patch '/tmp/portage/dev-qt/qtdbus-5.15.8.9999/work/qtbase-5.15-gentoo-patchset-2/0003-Use-link-option-pthread-instead-of-lpthread.patch' '  '
 *             environment, line  965:  Called __helpers_die 'patch -p1  failed with /tmp/portage/dev-qt/qtdbus-5.15.8.9999/work/qtbase-5.15-gentoo-patchset-2/0003-Use-link-option-pthread-instead-of-lpthread.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"


Reproducible: Always
Comment 1 Andreas Sturmlechner gentoo-dev 2023-01-08 12:09:13 UTC
Yes, patch needs to be rebased onto commit af2d7949.
Comment 2 Larry the Git Cow gentoo-dev 2023-01-08 14:38:38 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/qt.git/commit/?id=438f2aec5508b984baadee1e43edff4ee153961e

commit 438f2aec5508b984baadee1e43edff4ee153961e
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-01-08 14:19:10 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-01-08 14:23:59 +0000

    qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=3 for >=Qt5Base-5.15.8
    
    Closes: https://bugs.gentoo.org/889780
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 eclass/qt5-build.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a67782c38a4373620068698481fd1be89aa9e8c

commit 5a67782c38a4373620068698481fd1be89aa9e8c
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-01-08 14:20:59 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-01-08 14:24:03 +0000

    dev-qt/*: Re-manifest with qtbase-5.15-gentoo-patchset-3
    
    Bug: https://bugs.gentoo.org/889780
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 dev-qt/qtconcurrent/Manifest   | 2 +-
 dev-qt/qtcore/Manifest         | 2 +-
 dev-qt/qtdbus/Manifest         | 2 +-
 dev-qt/qtgui/Manifest          | 2 +-
 dev-qt/qtnetwork/Manifest      | 2 +-
 dev-qt/qtopengl/Manifest       | 2 +-
 dev-qt/qtprintsupport/Manifest | 2 +-
 dev-qt/qtsql/Manifest          | 2 +-
 dev-qt/qttest/Manifest         | 2 +-
 dev-qt/qtwidgets/Manifest      | 2 +-
 dev-qt/qtxml/Manifest          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)