diff --git a/PyQt3D-5.15.5.tar.gz b/PyQt3D-5.15.5.tar.gz deleted file mode 100644 index 3497a0e..0000000 --- a/PyQt3D-5.15.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c025e8a2de12a27e3bd34671d01cac39f78305128cc6cea3f0ba99e4ca3ec41b -size 7491496 diff --git a/PyQt3D-5.15.6.tar.gz b/PyQt3D-5.15.6.tar.gz new file mode 100644 index 0000000..5a3f4d6 --- /dev/null +++ b/PyQt3D-5.15.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d6c6d55cd8fc221b313c995c0f8729a377114926f0377f8e9011d45ebf3881c +size 7492379 diff --git a/python-qt3d-qt5.changes b/python-qt3d-qt5.changes index 414cfa7..4ae8d37 100644 --- a/python-qt3d-qt5.changes +++ b/python-qt3d-qt5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 29 19:47:01 UTC 2023 - Ben Greiner + +- Update to PyQt3D 5.15.6 + * Fixed building against Qt v5.15.8 and later. +- Drop qt3d-geometry-equals.patch + ------------------------------------------------------------------- Thu Jan 12 20:35:53 UTC 2023 - Ben Greiner diff --git a/python-qt3d-qt5.spec b/python-qt3d-qt5.spec index 6382b26..7165257 100644 --- a/python-qt3d-qt5.spec +++ b/python-qt3d-qt5.spec @@ -29,14 +29,13 @@ %define skip_python2 1 Name: python-%{mname} -Version: 5.15.5 +Version: 5.15.6 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} @@ -52,7 +51,7 @@ BuildRequires: pkgconfig(Qt53DInput) BuildRequires: pkgconfig(Qt53DLogic) BuildRequires: pkgconfig(Qt53DRender) Provides: python-PyQt3D = %{version}-%{release} -Requires: python-qt5 >= %{version} +Requires: python-qt5 >= 5.15.4 Requires: python-qt5-sip %python_subpackages diff --git a/qt3d-geometry-equals.patch b/qt3d-geometry-equals.patch deleted file mode 100644 index 0d55347..0000000 --- a/qt3d-geometry-equals.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 -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 QGeometryFactoryPtr;