diff --git a/0001-Handle-wxGLCanvas-CreateSurface-which-is-only-availa.patch b/0001-Handle-wxGLCanvas-CreateSurface-which-is-only-availa.patch new file mode 100644 index 0000000..e308492 --- /dev/null +++ b/0001-Handle-wxGLCanvas-CreateSurface-which-is-only-availa.patch @@ -0,0 +1,33 @@ +From 371101db7a010d679d214fde617dae9de02008d9 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Fri, 14 Jul 2023 13:23:03 -0400 +Subject: [PATCH] Handle wxGLCanvas::CreateSurface which is only available on + EGL + +--- + etg/_glcanvas.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/etg/_glcanvas.py b/etg/_glcanvas.py +index 52992ed8..2e578645 100644 +--- a/etg/_glcanvas.py ++++ b/etg/_glcanvas.py +@@ -125,6 +125,15 @@ def run(): + sipRes = wxGLCanvas::IsDisplaySupported(attribPtr); + """) + ++ c.find('CreateSurface').setCppCode("""\ ++ #if wxUSE_GLCANVAS_EGL ++ return self->CreateSurface(); ++ #else ++ wxPyRaiseNotImplemented(); ++ return false; ++ #endif ++ """) ++ + #----------------------------------------------------------------- + tools.doCommonTweaks(module) + tools.runGenerators(module) +-- +2.43.0 + diff --git a/0001-Update-wxTextCtrl-OSX-overrides-since-they-re-now-do.patch b/0001-Update-wxTextCtrl-OSX-overrides-since-they-re-now-do.patch new file mode 100644 index 0000000..bee8771 --- /dev/null +++ b/0001-Update-wxTextCtrl-OSX-overrides-since-they-re-now-do.patch @@ -0,0 +1,73 @@ +From 7a198b8cae9a81cec4d25a0c6c5cc65ad8822bb2 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Mon, 20 Nov 2023 22:12:58 -0500 +Subject: [PATCH] Update wxTextCtrl OSX overrides since they're now documented + +--- + etg/textctrl.py | 48 +++++++++++++++++++++--------------------------- + 1 file changed, 21 insertions(+), 27 deletions(-) + +diff --git a/etg/textctrl.py b/etg/textctrl.py +index af631a53..690d68c4 100644 +--- a/etg/textctrl.py ++++ b/etg/textctrl.py +@@ -114,35 +114,29 @@ def parseAndTweakModule(): + + + # OSX methods for controlling native features +- c.addCppMethod('void', 'OSXEnableAutomaticQuoteSubstitution', '(bool enable)', +- doc="Mac-only method for turning on/off automatic quote substitutions.", +- body="""\ +- #ifdef __WXMAC__ +- self->OSXEnableAutomaticQuoteSubstitution(enable); +- #else +- wxPyRaiseNotImplemented(); +- #endif +- """) ++ c.find('OSXEnableAutomaticQuoteSubstitution').setCppCode("""\ ++ #ifdef __WXMAC__ ++ self->OSXEnableAutomaticQuoteSubstitution(enable); ++ #else ++ wxPyRaiseNotImplemented(); ++ #endif ++ """) + +- c.addCppMethod('void', 'OSXEnableAutomaticDashSubstitution', '(bool enable)', +- doc="Mac-only method for turning on/off automatic dash substitutions.", +- body="""\ +- #ifdef __WXMAC__ +- self->OSXEnableAutomaticDashSubstitution(enable); +- #else +- wxPyRaiseNotImplemented(); +- #endif +- """) ++ c.find('OSXEnableAutomaticDashSubstitution').setCppCode("""\ ++ #ifdef __WXMAC__ ++ self->OSXEnableAutomaticDashSubstitution(enable); ++ #else ++ wxPyRaiseNotImplemented(); ++ #endif ++ """) + +- c.addCppMethod('void', 'OSXDisableAllSmartSubstitutions', '()', +- doc="Mac-only method to disable all automatic text substitutions.", +- body="""\ +- #ifdef __WXMAC__ +- self->OSXDisableAllSmartSubstitutions(); +- #else +- wxPyRaiseNotImplemented(); +- #endif +- """) ++ c.find('OSXDisableAllSmartSubstitutions').setCppCode("""\ ++ #ifdef __WXMAC__ ++ self->OSXDisableAllSmartSubstitutions(); ++ #else ++ wxPyRaiseNotImplemented(); ++ #endif ++ """) + + # TODO: add support for wxTextProofOptions (only supported on MSW/GTK3) + # so will need stubs on other platforms. +-- +2.43.0 + diff --git a/python-wxPython.changes b/python-wxPython.changes index ab34290..693f864 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 13 23:00:29 UTC 2023 - Jan Engelhardt + +- Add 0001-Update-wxTextCtrl-OSX-overrides-since-they-re-now-do.patch + 0001-Handle-wxGLCanvas-CreateSurface-which-is-only-availa.patch + to fix build failures with wx 3.2.4. + ------------------------------------------------------------------- Mon Sep 11 14:47:53 UTC 2023 - Stefan BrĂ¼ns diff --git a/python-wxPython.spec b/python-wxPython.spec index 9caefff..2a6decd 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -1,5 +1,5 @@ # -# spec file for package python-wxPython +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -91,12 +91,14 @@ URL: https://github.com/wxWidgets/Phoenix Source0: wxPython-%{version}.tar.gz Source1: python-wxPython-rpmlintrc Source2: repack +Patch1: 0001-Update-wxTextCtrl-OSX-overrides-since-they-re-now-do.patch +Patch2: 0001-Handle-wxGLCanvas-CreateSurface-which-is-only-availa.patch # PATCH-FIX-OPENSUSE -Patch1: use_stl_build.patch +Patch12: use_stl_build.patch # PATCH-FIX-UPSTREAM - https://github.com/wxWidgets/Phoenix/pull/2232 -Patch4: 0003-Make-pip-usage-in-wxget-optional.patch +Patch13: 0003-Make-pip-usage-in-wxget-optional.patch # PATCH-FIX-OPENSUSE -Patch5: 0004-Fix-time_t-ETG-typedef-extend-DateTime.FromTimeT-tes.patch +Patch14: 0004-Fix-time_t-ETG-typedef-extend-DateTime.FromTimeT-tes.patch # PATCH-FIX-OPENSUSE - Test fixes/additions: Patch112: 0001-Check-HSV-values-in-image-test.patch BuildRequires: %{python_module base}