- Merge -api and -sip packages into -devel
- Add qt3d-geometry-equals.patch * https://www.riverbankcomputing.com/pipermail/pyqt/2023-January/045097.html OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-qt3d-qt5?expand=0&rev=4
This commit is contained in:
parent
59fcac896f
commit
aaea51413e
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
%define have_qt3danimation 1
|
||||
%endif
|
||||
|
||||
%define oldpython python
|
||||
%define plainpython python
|
||||
%define mname qt3d-qt5
|
||||
|
||||
%define skip_python2 1
|
||||
@ -36,6 +36,7 @@ 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 @@ Requires: python-qt5-sip
|
||||
%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
|
||||
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
|
||||
This package provides the SIP files used to generate the Python bindings for
|
||||
%{name}
|
||||
%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 @@ BuildArch: noarch
|
||||
This package provides %{name} examples.
|
||||
|
||||
%prep
|
||||
%setup -q -n PyQt3D-%{version}
|
||||
%autosetup -p1 -n PyQt3D-%{version}
|
||||
|
||||
%build
|
||||
%pyqt_build
|
||||
@ -111,13 +113,10 @@ find examples/assets -type f -print0 | xargs -0 dos2unix
|
||||
%{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/
|
||||
|
28
qt3d-geometry-equals.patch
Normal file
28
qt3d-geometry-equals.patch
Normal file
@ -0,0 +1,28 @@
|
||||
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-11 22:35:44.718012376 +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_1 Qt3D_5_15_2 Qt3D_5_15_3 Qt3D_5_15_4 Qt3D_5_15_5 Qt3D_5_15_6 Qt3D_5_15_7 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 20:03:06.150720450 +0100
|
||||
@@ -35,7 +35,12 @@
|
||||
public:
|
||||
virtual ~QGeometryFactory();
|
||||
virtual Qt3DRender::QGeometry *operator()() = 0;
|
||||
+%If (- Qt3D_5_15_7)
|
||||
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;
|
Loading…
Reference in New Issue
Block a user