rpm/python-qt3d-qt5
SHA256
1
0
Fork 0
forked from pool/python-qt3d-qt5
Code Pull Requests Activity

Accepting request 1058201 from KDE:Qt:PyQt

Browse Source 
fix the fix

OBS-URL: https://build.opensuse.org/request/show/1058201
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-qt3d-qt5?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2023-01-13 23:02:34 +00:00 committed by Git OBS Bridge
commit aab915fc47
5 changed files with 89 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PyQt3D-5.15.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36bc56d7432ab6c59ea77e1df6f6f688d8abd6cdb340706d5cb0a9c665e13975
size 7500901

3
PyQt3D-5.15.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c025e8a2de12a27e3bd34671d01cac39f78305128cc6cea3f0ba99e4ca3ec41b
size 7491496

18
python-qt3d-qt5.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Jan 12 20:35:53 UTC 2023 - Ben Greiner <code@bnavigator.de>
- Fix Timeline generation for qt3d-geometry-equals.patch
-------------------------------------------------------------------
Thu Jan 12 19:07:57 UTC 2023 - Ben Greiner <code@bnavigator.de>
- 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 <code@bnavigator.de>
- Update to PyQt3D 5.15.5
* Added support for Python v3.10.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 13 15:58:34 UTC 2021 - Ben Greiner <code@bnavigator.de> Mon Sep 13 15:58:34 UTC 2021 - Ben Greiner <code@bnavigator.de>

45
python-qt3d-qt5.spec
View File

@ -24,18 +24,19 @@
%define have_qt3danimation 1 %define have_qt3danimation 1
%endif %endif
%define oldpython python %define plainpython python
%define mname qt3d-qt5 %define mname qt3d-qt5
%{?!python_module:%define python_module() python3-%{**}}
%define skip_python2 1 %define skip_python2 1
Name: python-%{mname} Name: python-%{mname}
Version: 5.15.4 Version: 5.15.5
Release: 0 Release: 0
Summary: Python bindings for the Qt5 3D framework Summary: Python bindings for the Qt5 3D framework
License: GPL-3.0-only License: GPL-3.0-only
Group: Development/Libraries/Python Group: Development/Libraries/Python
URL: https://www.riverbankcomputing.com/software/pyqtchart/intro URL: https://www.riverbankcomputing.com/software/pyqtchart/intro
Source: https://files.pythonhosted.org/packages/source/P/PyQt3D/PyQt3D-%{version}.tar.gz 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 devel}
BuildRequires: %{python_module pyqt-builder >= 1.9} BuildRequires: %{python_module pyqt-builder >= 1.9}
BuildRequires: %{python_module qt5-devel} BuildRequires: %{python_module qt5-devel}
@ -59,24 +60,25 @@ Requires: python-qt5-sip
%description %description
PyQt3D is a set of Python bindings for the Qt 3D framework. PyQt3D is a set of Python bindings for the Qt 3D framework.
%package api %package devel
Summary: Eric API files for %{name} Summary: Development files for %{name}
Group: Development/Tools/IDE 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 Requires: python-qt5-devel
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 sip %description devel
This package provides the SIP files used to generate the Python bindings for This package provides the SIP files used to generate the Python bindings
%{name} and the Qt5 3D framework API files for the Eric IDE for %{name}
%package doc %package doc
Summary: Examples for %{name} Summary: Examples for %{name}
@ -88,7 +90,7 @@ BuildArch: noarch
This package provides %{name} examples. This package provides %{name} examples.
%prep %prep
%setup -q -n PyQt3D-%{version} %autosetup -p1 -n PyQt3D-%{version}
%build %build
%pyqt_build %pyqt_build
@ -111,13 +113,10 @@ find examples/assets -type f -print0 | xargs -0 dos2unix
%{python_sitearch}/PyQt5/Qt3DRender.* %{python_sitearch}/PyQt5/Qt3DRender.*
%{python_sitearch}/PyQt3D-%{version}.dist-info/ %{python_sitearch}/PyQt3D-%{version}.dist-info/
%files %{python_files api} %files %{python_files devel}
%license LICENSE %license LICENSE
%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/ %dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQt3D.api %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQt3D.api
%files %{python_files sip}
%license LICENSE
%{?have_qt3danimation:%{pyqt5_sipdir}/Qt3DAnimation/} %{?have_qt3danimation:%{pyqt5_sipdir}/Qt3DAnimation/}
%{pyqt5_sipdir}/Qt3DCore/ %{pyqt5_sipdir}/Qt3DCore/
%{pyqt5_sipdir}/Qt3DExtras/ %{pyqt5_sipdir}/Qt3DExtras/

46
qt3d-geometry-equals.patch Normal file
View File

@ -0,0 +1,46 @@
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 <info@riverbankcomputing.com>
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;