helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-29 22:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3-wxgtk4: Do not use GetAssertStackTrace with USE_STACKWALKER disabled

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-12-20 09:55:59 -08:00
parent fe2654d57c
commit 85323a3b5c
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch Normal file
View File

@ -0,0 +1,32 @@
From b9f95c06b2e7a525f4f93d705976882e8dcba6ab 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 9c9f9d5b..1d2d2f90 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())

9
meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb
View File

@ -11,10 +11,11 @@ DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \
PYPI_PACKAGE = "wxPython" PYPI_PACKAGE = "wxPython"
SRC_URI += "file://add-back-option-build-base.patch \ SRC_URI += "file://add-back-option-build-base.patch \
file://wxgtk-fixup-build-scripts.patch \ file://wxgtk-fixup-build-scripts.patch \
file://not-overwrite-cflags-cxxflags.patch \ file://not-overwrite-cflags-cxxflags.patch \
file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \
" file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \
"
SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7" SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7"
S = "${WORKDIR}/wxPython-${PV}" S = "${WORKDIR}/wxPython-${PV}"