From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD54C159C9B for ; Tue, 13 Aug 2024 16:16:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10C65E2B02; Tue, 13 Aug 2024 16:16:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB211E2B02 for ; Tue, 13 Aug 2024 16:16:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21431335D2B for ; Tue, 13 Aug 2024 16:16:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DEF0E6F for ; Tue, 13 Aug 2024 16:16:20 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1723565609.4c836c037168c3ed1ba7696f69f4d1e90310b50c.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtbase/, dev-qt/qtbase/files/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch dev-qt/qtbase/qtbase-6.7.2-r1.ebuild dev-qt/qtbase/qtbase-6.7.2-r2.ebuild X-VCS-Directories: dev-qt/qtbase/ dev-qt/qtbase/files/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 4c836c037168c3ed1ba7696f69f4d1e90310b50c X-VCS-Branch: master Date: Tue, 13 Aug 2024 16:16:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 236011ab-1f20-49fb-b9fd-129738690384 X-Archives-Hash: d981e61d206d31b0147d9c9b4627e95c commit: 4c836c037168c3ed1ba7696f69f4d1e90310b50c Author: orbea riseup net> AuthorDate: Tue Aug 13 16:13:29 2024 +0000 Commit: orbea riseup net> CommitDate: Tue Aug 13 16:13:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=4c836c03 dev-qt/qtbase: add 6.7.2-r2, drop 6.7.2-r1 Signed-off-by: orbea riseup.net> .../qtbase/files/qtbase-6.7.2-float16-sse2.patch | 43 ++++++++++++++++++++++ dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch | 32 ++++++++++++++++ ...base-6.7.2-r1.ebuild => qtbase-6.7.2-r2.ebuild} | 2 + 3 files changed, 77 insertions(+) diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch b/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch new file mode 100644 index 0000000..a54c9da --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch @@ -0,0 +1,43 @@ +Backport from 6.7.3 as it may cause major problems for x86 sse2-less +systems using gcc14. + +https://github.com/qt/qtbase/commit/39fa7e7bef90be2940c5f736935f963e3969e0bd +From: Dmitry Shachnev +Date: Sat, 27 Jul 2024 23:03:07 +0300 +Subject: [PATCH] Use _Float16 only when SSE2 is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The GCC documentation [1] says: “On x86 targets with SSE2 enabled, GCC +supports half-precision (16-bit) floating point via the _Float16 type”. + +On non-SSE2 x86 (such as Debian i386 baseline [2]), __FLT16_MAX__ is +defined starting with GCC 14 [3], however any non-trivial use of the +_Float16 type results in an error: + +error: operation not permitted on type ‘_Float16’ without option ‘-msse2’ + +which makes some packages fail to build on i386 architecture [4]. + +[1]: https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html +[2]: https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 +[3]: https://gcc.gnu.org/g:9a19fa8b616f83474c35cc5b34a3865073ced829 +[4]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076986 +--- a/src/corelib/global/qtypes.h ++++ b/src/corelib/global/qtypes.h +@@ -264,11 +264,10 @@ + # define QFLOAT16_IS_NATIVE 1 + using NativeFloat16Type = decltype(__FLT16_MAX__); +-#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) ++#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__ARM_FP16_FORMAT_IEEE) + # define QFLOAT16_IS_NATIVE 1 +-# ifdef __ARM_FP16_FORMAT_IEEE + using NativeFloat16Type = __fp16; +-# else ++#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__SSE2__) ++# define QFLOAT16_IS_NATIVE 1 + using NativeFloat16Type = _Float16; +-# endif + #else + # define QFLOAT16_IS_NATIVE 0 diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch b/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch new file mode 100644 index 0000000..64cedb1 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch @@ -0,0 +1,32 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/582403 +From: Sam James +Date: Sat, 10 Aug 2024 16:43:05 +0100 +Subject: [PATCH] Fix ODR violation for IsFloatType_v + +With recent GCC 15 trunk, I started to see: +``` +ld: .../kwalletentry.cc.o:(.rodata+0x0): multiple definition of `QtPrivate::IsFloatType_v<_Float16>'; + src/runtime/kwalletd/backend/CMakeFiles/KF6WalletBackend.dir/cbc.cc.o:(.rodata+0x0): first defined here +``` + +The issue is that constexpr is only implicitly inline for functions or +static data members [0], so the two constexpr IsFloatType_v definitions +here cause an ODR violation. + +Explicitly mark them as inline constexpr. + +[0] http://eel.is/c++draft/dcl.constexpr#1.sentence-3 +--- a/src/corelib/global/qcomparehelpers.h ++++ b/src/corelib/global/qcomparehelpers.h +@@ -348,9 +348,9 @@ + + template +-constexpr bool IsFloatType_v = std::is_floating_point_v; ++inline constexpr bool IsFloatType_v = std::is_floating_point_v; + + #if QFLOAT16_IS_NATIVE + template <> +-constexpr bool IsFloatType_v = true; ++inline constexpr bool IsFloatType_v = true; + #endif + diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild similarity index 99% rename from dev-qt/qtbase/qtbase-6.7.2-r1.ebuild rename to dev-qt/qtbase/qtbase-6.7.2-r2.ebuild index 2fe9c04..35462e7 100644 --- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild @@ -147,6 +147,8 @@ PATCHES=( "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch "${FILESDIR}"/${PN}-6.7.2-CVE-2024-39936.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch + "${FILESDIR}"/${PN}-6.7.2-float16-sse2.patch ) src_prepare() {