From c55eb06f400dcc594715dc3354a907a476046f2dd276acd374589322d9720e35 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Thu, 2 Oct 2025 13:10:20 +0200 Subject: [PATCH] Update to version 4.2.3 This is a migration of https://build.suse.de/request/show/385673 --- python-3.13.1.patch | 27 ----------------------- python-wxPython.changes | 47 +++++++++++++++++++++++++++++++++++++++++ python-wxPython.spec | 18 ++++++++++------ use_stl_build.patch | 4 ++-- wxPython-4.2.2.tar.gz | 3 --- wxPython-4.2.3.tar.gz | 3 +++ 6 files changed, 64 insertions(+), 38 deletions(-) delete mode 100644 python-3.13.1.patch delete mode 100644 wxPython-4.2.2.tar.gz create mode 100644 wxPython-4.2.3.tar.gz diff --git a/python-3.13.1.patch b/python-3.13.1.patch deleted file mode 100644 index a9e34d5..0000000 --- a/python-3.13.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2adbeaa7854342a27aab828c128f2111a99c4cf0 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Thu, 23 Jan 2025 21:46:20 -0500 -Subject: [PATCH] Implement __iter__ for wxList iterator classes - -This fixes being able to use these classes in for loops, for example. -Specifically it fixes the cmdproc tests with Python 3.13.1. ---- - etgtools/tweaker_tools.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py -index b1ae6e7fc..9238a130c 100644 ---- a/etgtools/tweaker_tools.py -+++ b/etgtools/tweaker_tools.py -@@ -1055,6 +1055,11 @@ class {ListClass}_iterator {{ - if (PyErr_Occurred()) - return NULL; - %End -+ -+ PyObject* __iter__(); -+ %MethodCode -+ return PyObject_SelfIter(sipSelf); -+ %End - }}; - - class {ListClass} diff --git a/python-wxPython.changes b/python-wxPython.changes index 6397174..98809ab 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Wed Jul 16 06:22:06 UTC 2025 - Torsten Gruner + +- Update to version 4.2.3 + * Fix test issues with wx.lib.introspect (#2717) + * Add support for building on Windows ARM64 (#2521) + * Incorporate many improvements to type stubs (#2665) + * Fix building documentation with latest sphinx (#2672) + * Build smaller architecture-specific wheels on macOS instead of large + universal2 wheels + * Calculate scroll based on child's relative position to scrolledpanel + in wx.lib.scrolledpanel + * Fix float -> int conversion issues in wx.lib.fancytext (#2703) + * Replace deprecated NumPy type aliases + * Use wx.StaticText in wx.lib.agw.hyperlink (#2686) + * Implement partial support for pyproject.toml and other build process improvements + * Remove use of six and most Python 2 compatibility code + * Fix wxWidgets build on OpenSUSE (#558, #1067, #2422, #2532) + * Fix more int conversions in wx.lib.agw.flatnotebook + * Make build output reproducible + * Enable overridding wx.Sizer.InformFirstDirection() (#2452) + * Implement __iter__ for wxList iterator classes (fixes Python 3.13.1 issue) + * Fix wx.lib.mixins.rubberband not clearing DC on redraw + * Support implementing CreateBitmapBundle for custom ArtProvider + * Fix float/int conversion issues in wx.lib.ogl + * Include usage of wxMemoryFSHandler in webview demo + * Fix crash when accessing wx.stc.StyledTextCtrl.DropTarget.Data (#2043) + * Fix AuiManager pane minimizing issue + * Add range field to wx.lib.agw.pygauge.PyGauge format string (#2583) + * Fix pickling of wx.RealPoint (#2644) + * Avoid calling FlatMenu Destroy() in a finally block (#2630) + * Update wxApp.IsDisplayAvailable to work on Wayland + * Fix InspectionTool crashes due to bad perspective string errors + * Drop support for Python 3.8 (EOL) + * Add CreateAccessible for Windows only + * Added check condition to AuiManager LoadPerspective() + * Fix RecursionError in platebtn bitmap getters + * Add Python implementation of GetPaths (#1944) + * Support Wayland GTK backend in Window.GetHandle + * Refactor python only pdfviewer to support displaying pdf files where + not all pages have the same size + * Improve support when specifying a pre-existing toolbar as the target for + the restore icon when minimizing a pane in agw.aui + * Multiple bugfixes in pure python aui + * pdfviewer: Add support for pymupdf renaming +- remove python-3.13.1.patch + ------------------------------------------------------------------- Fri Jan 24 13:23:55 UTC 2025 - Markéta Machová diff --git a/python-wxPython.spec b/python-wxPython.spec index 1c60f22..75cbea0 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -16,6 +16,10 @@ # +%if 0%{suse_version} < 1600 +%define gccver 13 +%endif + %define X_display ":98" %bcond_without test %bcond_without syswx @@ -78,7 +82,7 @@ ExclusiveArch: donotbuild %endif Name: %{pprefix}-wxPython -Version: 4.2.2 +Version: 4.2.3 Release: 0 Summary: The "Phoenix" variant of the wxWidgets Python bindings License: GPL-2.0-or-later @@ -98,13 +102,12 @@ Patch15: CVE-2024-50602-no-crash-XML_ResumeParser.patch # PATCH-FIX-OPENSUSE - Test fixes/additions: Patch112: 0001-Check-HSV-values-in-image-test.patch Patch114: wxwidgets-3.2.5.patch -# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/Phoenix/pull/2680 Implement __iter__ for wxList iterator classes -Patch115: https://github.com/wxWidgets/Phoenix/commit/2adbeaa7854342a27aab828c128f2111a99c4cf0.patch#/python-3.13.1.patch # TODO: Replace deprecated setup.py calls in build.py with PEP517 without building wxWidgets into the wheel -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module devel} +BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} -BuildRequires: c++_compiler +BuildRequires: gcc%{?gccver}-c++ BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros @@ -112,7 +115,7 @@ BuildRequires: python-rpm-macros BuildRequires: %{python_module sip6-devel >= 6.8.3} BuildRequires: waf BuildRequires: wxGTK3-devel >= 3.2.0 -BuildRequires: wxWidgets-3_2-doc-xml >= 3.2.0 +BuildRequires: wxWidgets-3_2-doc-xml >= 3.2.7 %else BuildRequires: freeglut-devel BuildRequires: gstreamer-plugins-base-devel @@ -204,6 +207,9 @@ sed -i -e '/^#!\//, 1d' wx/py/tests/*.py echo "# empty module" >> wx/lib/pubsub/core/itopicdefnprovider.py %build +%{?gccver:export CXX=g++-%{gccver}} +%{?gccver:export CC=gcc-%{gccver}} + export CFLAGS="%{optflags}" %if %{with rebuild_sip} diff --git a/use_stl_build.patch b/use_stl_build.patch index b142338..b80aa3e 100644 --- a/use_stl_build.patch +++ b/use_stl_build.patch @@ -1,8 +1,8 @@ --- wxPython-4.1.0/buildtools/build_wxwidgets.py_orig 2020-05-30 01:24:47.890132236 +0200 +++ wxPython-4.1.0/buildtools/build_wxwidgets.py 2020-05-30 01:25:59.574988273 +0200 @@ -370,6 +370,8 @@ - if os.path.exists(frameworkRootDir): - shutil.rmtree(frameworkRootDir) + env = dict(os.environ) + del env["CONFIG_SITE"] + configure_opts.append("--enable-stl") + diff --git a/wxPython-4.2.2.tar.gz b/wxPython-4.2.2.tar.gz deleted file mode 100644 index d44c0c0..0000000 --- a/wxPython-4.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f24206ea92d6fbd1cf047bcac13de66218b66d2a69b4722616b979d8d965c1ca -size 55435195 diff --git a/wxPython-4.2.3.tar.gz b/wxPython-4.2.3.tar.gz new file mode 100644 index 0000000..4b7d584 --- /dev/null +++ b/wxPython-4.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfe292547f9130c8e0602bc57f3d3dfe96e75c28e4265f2b50ffc866263d466d +size 56424561