commit: 8520a12ca5a255ea1f0b0523a585f2d4396a51b3 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sun Feb 25 02:05:21 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Sun Feb 25 02:05:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8520a12c
dev-qt/qtbase: sync ::gentoo Signed-off-by: orbea <orbea <AT> riseup.net> dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch | 13 +++++++++++++ dev-qt/qtbase/qtbase-6.6.2.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch new file mode 100644 index 0000000..1204dcc --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/925103 +--- a/src/corelib/thread/qthread.h ++++ b/src/corelib/thread/qthread.h +@@ -166,5 +166,9 @@ + #elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) + // x86_64 Linux, BSD uses FS ++# if defined(__ILP32__) ++ __asm__("mov %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); ++# else + __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); ++# endif + #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN) + // See https://en.wikipedia.org/wiki/Win32_Thread_Information_Block diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild b/dev-qt/qtbase/qtbase-6.6.2.ebuild index aafc726..9348366 100644 --- a/dev-qt/qtbase/qtbase-6.6.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.2.ebuild @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch ) src_prepare() {
