[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     8eccbe3102ffc99bcbdea9545cb56f13e00efc6b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 16:46:12 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 16:57:42 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eccbe31

dev-qt/qt-creator: rebase execinfo patch in live

Not really tested but should work. It seems that the 2nd execinfo.h
is unused now (included for nothing), so can just drop the other
hunks given the code is gone assuming that not overlooking anything
elsewhere.

Closes: https://bugs.gentoo.org/950276
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/qt-creator-16.0.0-musl-no-execinfo.patch | 26 ++++++++++++++++++++++
 dev-qt/qt-creator/qt-creator-9999.ebuild           |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch
new file mode 100644
index 000000000000..289f68f4c3aa
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch
@@ -0,0 +1,26 @@
+execinfo is unavailable with musl (unless opt to package+use libexecinfo)
+--- a/src/libs/utils/qtcassert.cpp
++++ b/src/libs/utils/qtcassert.cpp
+@@ -9,5 +9,5 @@
+ #include <QTime>
+ 
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ #include <stdio.h>
+ #include <signal.h>
+@@ -30,5 +30,5 @@
+     if (maxdepth < 0 || maxdepth > ArraySize)
+         maxdepth = ArraySize;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+     void *bt[ArraySize] = {nullptr};
+     int size = backtrace(bt, maxdepth);
+--- a/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
++++ b/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
+@@ -4,5 +4,5 @@
+ #include "exception.h"
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include <execinfo.h>
+ #include <cxxabi.h>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 731691c88d92..0b150a349399 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -100,7 +100,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-16.0.0-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )