Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-qt3d-qt5 for openSUSE:Factory
checked in at 2023-01-14 00:02:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt3d-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qt3d-qt5.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt3d-qt5"
Sat Jan 14 00:02:34 2023 rev:12 rq:1058201 version:5.15.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt3d-qt5/python-qt3d-qt5.changes
2021-09-14 21:14:59.612440595 +0200
+++
/work/SRC/openSUSE:Factory/.python-qt3d-qt5.new.32243/python-qt3d-qt5.changes
2023-01-14 00:02:57.765621788 +0100
@@ -1,0 +2,18 @@
+Thu Jan 12 20:35:53 UTC 2023 - Ben Greiner <[email protected]>
+
+- Fix Timeline generation for qt3d-geometry-equals.patch
+
+-------------------------------------------------------------------
+Thu Jan 12 19:07:57 UTC 2023 - Ben Greiner <[email protected]>
+
+- Merge -api and -sip packages into -devel
+- Add qt3d-geometry-equals.patch
+ * https://www.riverbankcomputing.com/pipermail/pyqt/2023-January/045097.html
+
+-------------------------------------------------------------------
+Wed Jan 11 09:14:18 UTC 2023 - Ben Greiner <[email protected]>
+
+- Update to PyQt3D 5.15.5
+ * Added support for Python v3.10.
+
+-------------------------------------------------------------------
Old:
----
PyQt3D-5.15.4.tar.gz
New:
----
PyQt3D-5.15.5.tar.gz
qt3d-geometry-equals.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt3d-qt5.spec ++++++
--- /var/tmp/diff_new_pack.5STrgb/_old 2023-01-14 00:02:59.077629430 +0100
+++ /var/tmp/diff_new_pack.5STrgb/_new 2023-01-14 00:02:59.081629453 +0100
@@ -24,18 +24,19 @@
%define have_qt3danimation 1
%endif
-%define oldpython python
+%define plainpython python
%define mname qt3d-qt5
-%{?!python_module:%define python_module() python3-%{**}}
+
%define skip_python2 1
Name: python-%{mname}
-Version: 5.15.4
+Version: 5.15.5
Release: 0
Summary: Python bindings for the Qt5 3D framework
License: GPL-3.0-only
Group: Development/Libraries/Python
URL: https://www.riverbankcomputing.com/software/pyqtchart/intro
Source:
https://files.pythonhosted.org/packages/source/P/PyQt3D/PyQt3D-%{version}.tar.gz
+Patch0: qt3d-geometry-equals.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pyqt-builder >= 1.9}
BuildRequires: %{python_module qt5-devel}
@@ -59,24 +60,25 @@
%description
PyQt3D is a set of Python bindings for the Qt 3D framework.
-%package api
-Summary: Eric API files for %{name}
+%package devel
+Summary: Development files for %{name}
Group: Development/Tools/IDE
-Supplements: packageand(eric:python-%{mname})
-
-%description api
-This package provides Qt5 3D framework API files for the Eric IDE.
-
-%package sip
-Summary: Sip files for %{name}
-Group: Development/Libraries/Python
-Provides: %{oldpython}-%{mname}-sip = %{version}-%{release}
-Obsoletes: %{oldpython}-%{mname}-sip < %{version}-%{release}
Requires: python-qt5-devel
-
-%description sip
-This package provides the SIP files used to generate the Python bindings for
-%{name}
+Requires: %{plainpython}(abi) = %python_version
+Supplements: (eric and python-%{mname})
+Supplements: (python-qt5-devel and python-%{mname})
+Provides: python-%{mname}-sip = %{version}-%{release}
+Obsoletes: python-%{mname}-sip < %{version}-%{release}
+Provides: python-%{mname}-api = %{version}-%{release}
+Obsoletes: python-%{mname}-api < %{version}-%{release}
+Provides: %{plainpython}-%{mname}-sip = %{version}-%{release}
+Obsoletes: %{plainpython}-%{mname}-sip < %{version}-%{release}
+Provides: %{plainpython}-%{mname}-api = %{version}-%{release}
+Obsoletes: %{plainpython}-%{mname}-api < %{version}-%{release}
+
+%description devel
+This package provides the SIP files used to generate the Python bindings
+and the Qt5 3D framework API files for the Eric IDE for %{name}
%package doc
Summary: Examples for %{name}
@@ -88,7 +90,7 @@
This package provides %{name} examples.
%prep
-%setup -q -n PyQt3D-%{version}
+%autosetup -p1 -n PyQt3D-%{version}
%build
%pyqt_build
@@ -111,13 +113,10 @@
%{python_sitearch}/PyQt5/Qt3DRender.*
%{python_sitearch}/PyQt3D-%{version}.dist-info/
-%files %{python_files api}
+%files %{python_files devel}
%license LICENSE
%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQt3D.api
-
-%files %{python_files sip}
-%license LICENSE
%{?have_qt3danimation:%{pyqt5_sipdir}/Qt3DAnimation/}
%{pyqt5_sipdir}/Qt3DCore/
%{pyqt5_sipdir}/Qt3DExtras/
++++++ PyQt3D-5.15.4.tar.gz -> PyQt3D-5.15.5.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-qt3d-qt5/PyQt3D-5.15.4.tar.gz
/work/SRC/openSUSE:Factory/.python-qt3d-qt5.new.32243/PyQt3D-5.15.5.tar.gz
differ: char 5, line 1
++++++ qt3d-geometry-equals.patch ++++++
diff -ur PyQt3D-5.15.5.orig/configure.py PyQt3D-5.15.5/configure.py
--- PyQt3D-5.15.5.orig/configure.py 2023-01-11 16:36:08.772857551 +0100
+++ PyQt3D-5.15.5/configure.py 2023-01-12 21:48:49.016850894 +0100
@@ -552,12 +552,12 @@
"""
# Qt v5.12.4 was the last release where we updated PyQt for a patch
- # version.
+ # version. And SUSE started at 5.15.8 again
major = (target_configuration.qt_version >> 16) & 0xff
minor = (target_configuration.qt_version >> 8) & 0xff
patch = target_configuration.qt_version & 0xff
- if (major, minor) >= (5, 13):
+ if (major, minor) >= (5, 13) and (major, minor, patch) < (5, 15, 8):
patch = 0
elif (major, minor) == (5, 12):
if patch > 4:
diff -ur PyQt3D-5.15.5.orig/sip/Qt3DCore/Qt3DCoremod.sip
PyQt3D-5.15.5/sip/Qt3DCore/Qt3DCoremod.sip
--- PyQt3D-5.15.5.orig/sip/Qt3DCore/Qt3DCoremod.sip 2023-01-11
16:36:08.788857951 +0100
+++ PyQt3D-5.15.5/sip/Qt3DCore/Qt3DCoremod.sip 2023-01-12 21:43:54.953179289
+0100
@@ -25,7 +25,7 @@
%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
-%Timeline {Qt3D_5_7_0 Qt3D_5_7_1 Qt3D_5_8_0 Qt3D_5_9_0 Qt3D_5_9_1 Qt3D_5_9_2
Qt3D_5_9_3 Qt3D_5_9_4 Qt3D_5_9_5 Qt3D_5_9_6 Qt3D_5_9_7 Qt3D_5_9_8 Qt3D_5_9_9
Qt3D_5_10_0 Qt3D_5_10_1 Qt3D_5_11_0 Qt3D_5_11_1 Qt3D_5_11_2 Qt3D_5_11_3
Qt3D_5_12_0 Qt3D_5_12_1 Qt3D_5_12_2 Qt3D_5_12_3 Qt3D_5_12_4 Qt3D_5_13_0
Qt3D_5_14_0 Qt3D_5_15_0}
+%Timeline {Qt3D_5_7_0 Qt3D_5_7_1 Qt3D_5_8_0 Qt3D_5_9_0 Qt3D_5_9_1 Qt3D_5_9_2
Qt3D_5_9_3 Qt3D_5_9_4 Qt3D_5_9_5 Qt3D_5_9_6 Qt3D_5_9_7 Qt3D_5_9_8 Qt3D_5_9_9
Qt3D_5_10_0 Qt3D_5_10_1 Qt3D_5_11_0 Qt3D_5_11_1 Qt3D_5_11_2 Qt3D_5_11_3
Qt3D_5_12_0 Qt3D_5_12_1 Qt3D_5_12_2 Qt3D_5_12_3 Qt3D_5_12_4 Qt3D_5_13_0
Qt3D_5_14_0 Qt3D_5_15_0 Qt3D_5_15_8}
%Copying
Copyright (c) 2021 Riverbank Computing Limited <[email protected]>
diff -ur PyQt3D-5.15.5.orig/sip/Qt3DRender/qgeometryfactory.sip
PyQt3D-5.15.5/sip/Qt3DRender/qgeometryfactory.sip
--- PyQt3D-5.15.5.orig/sip/Qt3DRender/qgeometryfactory.sip 2023-01-11
16:36:08.796858151 +0100
+++ PyQt3D-5.15.5/sip/Qt3DRender/qgeometryfactory.sip 2023-01-12
21:44:48.070563125 +0100
@@ -35,7 +35,12 @@
public:
virtual ~QGeometryFactory();
virtual Qt3DRender::QGeometry *operator()() = 0;
+%If (- Qt3D_5_15_0)
virtual bool operator==(const Qt3DRender::QGeometryFactory &other)
const = 0;
+%End
+%If (Qt3D_5_15_8 -)
+ virtual bool equals(const Qt3DRender::QGeometryFactory &other) const =
0;
+%End
};
typedef QSharedPointer<Qt3DRender::QGeometryFactory> QGeometryFactoryPtr;
