commit: 4c836c037168c3ed1ba7696f69f4d1e90310b50c Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Aug 13 16:13:29 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> 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 <orbea <AT> 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 <[email protected]> +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 <[email protected]> +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 <typename T> +-constexpr bool IsFloatType_v = std::is_floating_point_v<T>; ++inline constexpr bool IsFloatType_v = std::is_floating_point_v<T>; + + #if QFLOAT16_IS_NATIVE + template <> +-constexpr bool IsFloatType_v<QtPrivate::NativeFloat16Type> = true; ++inline constexpr bool IsFloatType_v<QtPrivate::NativeFloat16Type> = 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() {
