mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-17 16:44:04 +00:00
a01270e642
This addresses python 3.13 issues. License-Update: added bsd-2-clause to LICENSE.txt Drop 0001-sip-Fix-build-with-gcc-14.patch as already fixed upstream. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From b62aa1a2e3e0feced819a375be3b2187cc356284 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Tue, 20 Dec 2022 09:46:31 -0800
|
|
Subject: [PATCH] sip: Conditionally use GetAssertStackTrace under
|
|
USE_STACKWALKER
|
|
|
|
Musl eg. does not implement stack walker ( backtrace ) therefore it gets
|
|
disabled for wxwidgets on those systems. This needs to be checked before using
|
|
GetAssertStackTrace()
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
sip/cpp/sip_corewxAppTraits.cpp | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/sip/cpp/sip_corewxAppTraits.cpp b/sip/cpp/sip_corewxAppTraits.cpp
|
|
index 9a9a4a66..a54e7659 100644
|
|
--- a/sip/cpp/sip_corewxAppTraits.cpp
|
|
+++ b/sip/cpp/sip_corewxAppTraits.cpp
|
|
@@ -471,7 +471,11 @@ static PyObject *meth_wxAppTraits_GetAssertStackTrace(PyObject *sipSelf, PyObjec
|
|
PyErr_Clear();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
+#if wxUSE_STACKWALKER
|
|
sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
|
|
+#else
|
|
+ sipRes = new ::wxString("");
|
|
+#endif
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (PyErr_Occurred())
|