From 8eccbe3102ffc99bcbdea9545cb56f13e00efc6b Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Tue, 25 Feb 2025 11:46:12 -0500 Subject: [PATCH] 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 --- .../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(-) create mode 100644 dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch 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 0000000000000..289f68f4c3aa9 --- /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 + +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + #include + #include +@@ -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 + #include diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 731691c88d922..0b150a3493990 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 )