Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-qt5 for openSUSE:Factory
checked in at 2021-11-06 18:13:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qt5.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5"
Sat Nov 6 18:13:28 2021 rev:58 rq:929207 version:5.15.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2021-10-31
22:56:19.807729966 +0100
+++ /work/SRC/openSUSE:Factory/.python-qt5.new.1890/python-qt5.changes
2021-11-06 18:14:07.680762853 +0100
@@ -1,0 +2,13 @@
+Thu Nov 4 10:07:17 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Remove py_ssize_t_clean argument from QtCoremod.sip in order to
+ make downstream packages buildable with sip < 6.4 -- boo#1192300
+
+-------------------------------------------------------------------
+Wed Nov 3 14:18:07 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Don't require python-sip-devel for python-qt5-devel. The project
+ building against PyQt should explicitly know about the proper
+ requirement. -- boo#1192300
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt5.spec ++++++
--- /var/tmp/diff_new_pack.265MNT/_old 2021-11-06 18:14:08.220763137 +0100
+++ /var/tmp/diff_new_pack.265MNT/_new 2021-11-06 18:14:08.220763137 +0100
@@ -96,7 +96,6 @@
Requires: python-%{mname} = %{version}
Requires: python-dbus-python-devel
Requires: python-devel
-Requires: python-sip-devel >= 6.4
Requires: pkgconfig(Qt5Bluetooth)
Requires: pkgconfig(Qt5Designer)
Requires: pkgconfig(Qt5Help)
@@ -120,6 +119,9 @@
Requires: %{oldpython}(abi) = %{python_version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
+# If and which version of sip is required depends on the project trying
+# to build against PyQt5.
+Recommends: python-sip-devel
Recommends: python-qscintilla-qt5
Recommends: pkgconfig(Qt5Quick3D)
Provides: python-PyQt5-devel = %{version}-%{release}
@@ -198,6 +200,14 @@
dos2unix examples/tools/codecs/encodedfiles/iso-8859-1.txt
dos2unix examples/tools/codecs/encodedfiles/iso-8859-15.txt
+# remove argument to `#define PY_SSIZE_T_CLEAN`
+# before any `#include <Python.h>` which was introduced by SIP 6.4
+# for Python 3.10 builds but prevents downstream packages stuck on
+# SIP v4 or SIP v5 (qgis) from building -- boo#1192300
+# https://docs.python.org/3/c-api/arg.html#arg-parsing
+ sed -e 's/, py_ssize_t_clean=True//' \
+ -i sip/QtCore/QtCoremod.sip
+
%build
# sip-build requires QtCore as target, even if we want a nonring module only
%{pyqt_build -v \
