diff --git a/python-wxpython4.spec b/python-wxpython4.spec index fe998bf..ee35a91 100644 --- a/python-wxpython4.spec +++ b/python-wxpython4.spec @@ -12,7 +12,7 @@ specific code. Name: python-wxpython4 Version: 4.0.7 -Release: 19%{?dist} +Release: 20%{?dist} Summary: %{sum} # wxPython is licensed under the wxWidgets license. The only exception is # the pubsub code in wx/lib/pubsub which is BSD licensed. Note: wxPython @@ -30,6 +30,7 @@ Patch3: restore-gil-pseudodc.patch Patch4: fix-ftbfs-doxygen-1.9.0.patch Patch5: sip6-remove-enum.patch Patch6: sip6.patch +Patch7: sip6-unicode-error.patch BuildRequires: gcc-c++ BuildRequires: doxygen @@ -170,6 +171,9 @@ xvfb-run -a %{__python3} build.py test --pytest_timeout=60 --extra_pytest="-k $S %changelog +* Tue Aug 03 2021 Scott Talbert - 4.0.7-20 +- Fix UnicodeDecodeError on package import due to sip 6 (#1988466) + * Tue Jul 27 2021 Fedora Release Engineering - 4.0.7-19 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sip6-unicode-error.patch b/sip6-unicode-error.patch new file mode 100644 index 0000000..d94698b --- /dev/null +++ b/sip6-unicode-error.patch @@ -0,0 +1,12 @@ +diff -up wxPython-4.0.7/ext/wxWidgets/interface/wx/listctrl.h.utf8 wxPython-4.0.7/ext/wxWidgets/interface/wx/listctrl.h +--- wxPython-4.0.7/ext/wxWidgets/interface/wx/listctrl.h.utf8 2019-10-20 09:39:15.000000000 -0400 ++++ wxPython-4.0.7/ext/wxWidgets/interface/wx/listctrl.h 2021-08-03 18:37:47.530688912 -0400 +@@ -1570,7 +1570,7 @@ public: + @class wxListView + + This class currently simply presents a simpler to use interface for the +- wxListCtrl -- it can be thought of as a @e façade for that complicated class. ++ wxListCtrl -- it can be thought of as a @e facade for that complicated class. + + Using it is preferable to using wxListCtrl directly whenever possible because + in the future some ports might implement wxListView but not the full set of