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

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

commit:     371f7190a77ebcf80fe60993d8b3f2308e9c5e24
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 11:03:57 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 12:09:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371f7190

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

Untested but the patch is identical beside needing to update
a moved file's path.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/qt-creator-15.0.0-musl-no-execinfo.patch | 47 ++++++++++++++++++++++
 dev-qt/qt-creator/qt-creator-9999.ebuild           |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-15.0.0-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-15.0.0-musl-no-execinfo.patch
new file mode 100644
index 000000000000..5e3bbf25b6c3
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-15.0.0-musl-no-execinfo.patch
@@ -0,0 +1,47 @@
+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>
+@@ -31,5 +31,5 @@
+ namespace QmlDesigner {
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ const char* demangle(const char* name)
+ {
+@@ -76,5 +76,5 @@
+ }
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ static QString getBackTrace()
+ {
+@@ -114,5 +114,5 @@
+   , m_file(QString::fromUtf8(file))
+   , m_description(description)
+-  #ifdef Q_OS_LINUX
++  #if defined(Q_OS_LINUX) && defined(__GLIBC__)
+   , m_backTrace(getBackTrace())
+   #endif

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 23836162a90d..99cda33d0135 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -97,7 +97,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )