forked from pool/python-wxPython
Accepting request 1178778 from X11:wxWidgets
- Add wxwidgets-3.2.5.patch to resolve wxPython FTBFS (forwarded request 1176820 from jengelh) OBS-URL: https://build.opensuse.org/request/show/1178778 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-wxPython?expand=0&rev=22
This commit is contained in:
commit
ff702d0ccb
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 25 09:16:36 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add wxwidgets-3.2.5.patch to resolve wxPython FTBFS
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 23 12:16:15 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
@ -111,6 +111,7 @@ Patch14: 0004-Fix-time_t-ETG-typedef-extend-DateTime.FromTimeT-tes.patch
|
||||
Patch112: 0001-Check-HSV-values-in-image-test.patch
|
||||
# PATCH-FIX-OPENSUSE - Numpy for Python 3.12 is a thing
|
||||
Patch113: require-numpy.patch
|
||||
Patch114: wxwidgets-3.2.5.patch
|
||||
# TODO: Replace deprecated setup.py calls in build.py with PEP517 without building wxWidgets into the wheel
|
||||
BuildRequires: %{python_module base}
|
||||
BuildRequires: %{python_module devel}
|
||||
|
34
wxwidgets-3.2.5.patch
Normal file
34
wxwidgets-3.2.5.patch
Normal file
@ -0,0 +1,34 @@
|
||||
Do not fail the wxPython build when using a wxWidgets-3.2.5 base.
|
||||
|
||||
Generated by:
|
||||
git diff 5622abb73deaa26dc2f6dc4cd8b4b2050396b49a..78938da1218483024b3a7acf55b5fb5513882916 etg/
|
||||
|
||||
|
||||
diff --git etg/window.py etg/window.py
|
||||
index c388df76..0c035f14 100644
|
||||
--- a/etg/window.py
|
||||
+++ a/etg/window.py
|
||||
@@ -251,6 +251,23 @@ def run():
|
||||
return NULL;
|
||||
#endif
|
||||
""")
|
||||
+ c.find('GetOrCreateAccessible').setCppCode("""\
|
||||
+ #if wxUSE_ACCESSIBILITY
|
||||
+ return self->GetOrCreateAccessible();
|
||||
+ #else
|
||||
+ wxPyRaiseNotImplemented();
|
||||
+ return NULL;
|
||||
+ #endif
|
||||
+ """)
|
||||
+ c.find('CreateAccessible').factory = True
|
||||
+ c.find('CreateAccessible').setCppCode("""\
|
||||
+ #if wxUSE_ACCESSIBILITY
|
||||
+ return self->CreateAccessible();
|
||||
+ #else
|
||||
+ wxPyRaiseNotImplemented();
|
||||
+ return NULL;
|
||||
+ #endif
|
||||
+ """)
|
||||
c.find('SetAccessible.accessible').transfer = True
|
||||
c.find('SetAccessible').setCppCode("""\
|
||||
#if wxUSE_ACCESSIBILITY
|
Loading…
Reference in New Issue
Block a user