Accepting request 922900 from home:bnavigator:branches:KDE:Qt:PyQt
- Update to version 6.2.0 * Added support for Qt v6.2 including the QtBluetooth, QtMultimedia, QtMultimediaWidgets, QtNfc, QtPositioning, QtRemoteObjects, QtSensors, QtSerialPort, QtWebChannel and QtWebSockets modules. * Added support for QAxContainer on Windows. * Ported the QtMultimedia examples from PyQt5. * Bug fixes. - Drop PyQt6-6.1.1-OpenGL_ES2.patch merged upstream OBS-URL: https://build.opensuse.org/request/show/922900 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-PyQt6?expand=0&rev=8
This commit is contained in:
parent
ddc3d38171
commit
103ddc98fc
@ -1,68 +0,0 @@
|
||||
diff -ur PyQt6-6.1.1/sip/QtOpenGL/qopengldebug.sip PyQt6-6.2.0.dev2107140930/sip/QtOpenGL/qopengldebug.sip
|
||||
--- PyQt6-6.1.1/sip/QtOpenGL/qopengldebug.sip 2021-06-13 12:57:21.368647000 +0200
|
||||
+++ PyQt6-6.2.0.dev2107140930/sip/QtOpenGL/qopengldebug.sip 2021-07-14 15:52:42.250498000 +0200
|
||||
@@ -99,8 +99,16 @@
|
||||
{sipName_QOpenGLDebugLogger, &sipType_QOpenGLDebugLogger, -1, 1},
|
||||
{sipName_QOpenGLShader, &sipType_QOpenGLShader, -1, 2},
|
||||
{sipName_QOpenGLShaderProgram, &sipType_QOpenGLShaderProgram, -1, 3},
|
||||
+ #if !defined(SIP_FEATURE_PyQt_OpenGL_ES2)
|
||||
{sipName_QOpenGLTimeMonitor, &sipType_QOpenGLTimeMonitor, -1, 4},
|
||||
+ #else
|
||||
+ {0, 0, -1, 4},
|
||||
+ #endif
|
||||
+ #if !defined(SIP_FEATURE_PyQt_OpenGL_ES2)
|
||||
{sipName_QOpenGLTimerQuery, &sipType_QOpenGLTimerQuery, -1, 5},
|
||||
+ #else
|
||||
+ {0, 0, -1, 5},
|
||||
+ #endif
|
||||
{sipName_QOpenGLVertexArrayObject, &sipType_QOpenGLVertexArrayObject, -1, 6},
|
||||
{sipName_QOpenGLWindow, &sipType_QOpenGLWindow, -1, -1},
|
||||
};
|
||||
diff -ur PyQt6-6.1.1/sip/QtOpenGL/qopengltimerquery.sip PyQt6-6.2.0.dev2107140930/sip/QtOpenGL/qopengltimerquery.sip
|
||||
--- PyQt6-6.1.1/sip/QtOpenGL/qopengltimerquery.sip 2021-06-13 12:57:21.280266000 +0200
|
||||
+++ PyQt6-6.2.0.dev2107140930/sip/QtOpenGL/qopengltimerquery.sip 2021-07-14 15:52:42.211065000 +0200
|
||||
@@ -20,6 +20,8 @@
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
|
||||
+%If (!PyQt_OpenGL_ES2)
|
||||
+
|
||||
class QOpenGLTimerQuery : QObject
|
||||
{
|
||||
%TypeHeaderCode
|
||||
@@ -41,6 +43,9 @@
|
||||
GLuint64 waitForResult() const /ReleaseGIL/;
|
||||
};
|
||||
|
||||
+%End
|
||||
+%If (!PyQt_OpenGL_ES2)
|
||||
+
|
||||
class QOpenGLTimeMonitor : QObject
|
||||
{
|
||||
%TypeHeaderCode
|
||||
@@ -62,3 +67,5 @@
|
||||
QList<GLuint64> waitForIntervals() const /ReleaseGIL/;
|
||||
void reset();
|
||||
};
|
||||
+
|
||||
+%End
|
||||
diff -ur PyQt6-6.1.1/sip/QtOpenGL/qpyopengl_qlist.sip PyQt6-6.2.0.dev2107140930/sip/QtOpenGL/qpyopengl_qlist.sip
|
||||
--- PyQt6-6.1.1/sip/QtOpenGL/qpyopengl_qlist.sip 2021-06-13 12:57:21.266533000 +0200
|
||||
+++ PyQt6-6.2.0.dev2107140930/sip/QtOpenGL/qpyopengl_qlist.sip 2021-07-14 15:52:42.202424000 +0200
|
||||
@@ -19,6 +19,9 @@
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
|
||||
+%If (!PyQt_OpenGL_ES2)
|
||||
+
|
||||
+
|
||||
%MappedType QList<GLuint64>
|
||||
/TypeHintIn="Iterable[int]", TypeHintOut="List[int]",
|
||||
TypeHintValue="[]"/
|
||||
@@ -121,3 +124,6 @@
|
||||
return sipGetState(sipTransferObj);
|
||||
%End
|
||||
};
|
||||
+
|
||||
+
|
||||
+%End
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8775244fa73f94bfe8ae7672b624e2a903a22bc35d7ea42dd830949e2f9e43c7
|
||||
size 949676
|
3
PyQt6-6.2.0.tar.gz
Normal file
3
PyQt6-6.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:142ce7fa574d7ebb13fb0a2ebd18c86087c35829f786c094a71a0749155d8fee
|
||||
size 1021075
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 3 12:46:47 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Update to version 6.2.0
|
||||
* Added support for Qt v6.2 including the QtBluetooth,
|
||||
QtMultimedia, QtMultimediaWidgets, QtNfc, QtPositioning,
|
||||
QtRemoteObjects, QtSensors, QtSerialPort, QtWebChannel and
|
||||
QtWebSockets modules.
|
||||
* Added support for QAxContainer on Windows.
|
||||
* Ported the QtMultimedia examples from PyQt5.
|
||||
* Bug fixes.
|
||||
- Drop PyQt6-6.1.1-OpenGL_ES2.patch merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 19 07:33:23 UTC 2021 - Bernhard Wiedemann <bwiedemann@suse.com>
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
%define mname PyQt6
|
||||
%define pyqt_build_for_qt6 1
|
||||
Name: python-%{mname}
|
||||
Version: 6.1.1
|
||||
Version: 6.2.0
|
||||
Release: 0
|
||||
Summary: Python bindings for Qt 6
|
||||
License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
|
||||
@ -32,13 +32,11 @@ Source: https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-%{v
|
||||
Patch0: disable-rpaths.diff
|
||||
# PATCH-FIX-OPENSUSE - install binary dbus mainloop integration in arch dependent directory
|
||||
Patch1: 0001-Use-a-noarch-wrapper-for-dbus-mainloop-integration.patch
|
||||
# PATCH-FIX-UPSTREAM PyQt6-6.1.1-OpenGL_ES2.patch -- fix opengles2 typedefs: https://www.riverbankcomputing.com/pipermail/pyqt/2021-July/044117.html
|
||||
Patch3: PyQt6-6.1.1-OpenGL_ES2.patch
|
||||
BuildRequires: %{python_module PyQt6-sip}
|
||||
BuildRequires: %{python_module dbus-python-devel >= 0.8}
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module pyqt-builder >= 1.8}
|
||||
BuildRequires: %{python_module sip-devel >= 6}
|
||||
BuildRequires: %{python_module pyqt-builder >= 1.11}
|
||||
BuildRequires: %{python_module sip-devel >= 6.2}
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: fdupes
|
||||
@ -47,14 +45,26 @@ BuildRequires: python-pyqt-rpm-macros
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: qt6-base-devel
|
||||
BuildRequires: qt6-macros
|
||||
BuildRequires: cmake(Qt6Bluetooth)
|
||||
BuildRequires: cmake(Qt6Designer)
|
||||
BuildRequires: cmake(Qt6Help)
|
||||
BuildRequires: cmake(Qt6Multimedia)
|
||||
BuildRequires: cmake(Qt6MultimediaWidgets)
|
||||
BuildRequires: cmake(Qt6Nfc)
|
||||
BuildRequires: cmake(Qt6Positioning)
|
||||
BuildRequires: cmake(Qt6Qml)
|
||||
BuildRequires: cmake(Qt6Quick)
|
||||
BuildRequires: cmake(Qt6Quick3D)
|
||||
BuildRequires: cmake(Qt6Quick3DRuntimeRender)
|
||||
BuildRequires: cmake(Qt6QuickWidgets)
|
||||
BuildRequires: cmake(Qt6RemoteObjects)
|
||||
BuildRequires: cmake(Qt6Sensors)
|
||||
BuildRequires: cmake(Qt6SerialPort)
|
||||
BuildRequires: cmake(Qt6Svg)
|
||||
BuildRequires: cmake(Qt6WebChannel)
|
||||
BuildRequires: cmake(Qt6WebSockets)
|
||||
# SECTION not packaged for 6.2 yet https://github.com/assimp/assimp/issues/3948
|
||||
# BuildRequires: cmake(Qt6Quick3D)
|
||||
# BuildRequires: cmake(Qt6Quick3DRuntimeRender)
|
||||
# /SECTION
|
||||
Requires: python-PyQt6-sip
|
||||
%requires_ge python-dbus-python
|
||||
Provides: python-qt6 = %{version}-%{release}
|
||||
@ -69,16 +79,29 @@ Group: Development/Libraries/Python
|
||||
Requires: python-%{mname} = %{version}
|
||||
Requires: python-dbus-python-devel >= 0.8
|
||||
Requires: python-devel
|
||||
Requires: python-sip-devel >= 6
|
||||
Requires: python-sip-devel >= 6.2
|
||||
Requires: qt6-base-devel
|
||||
Requires: qt6-macros
|
||||
Requires: cmake(Qt6Bluetooth)
|
||||
Requires: cmake(Qt6Designer)
|
||||
Requires: cmake(Qt6Help)
|
||||
Requires: cmake(Qt6Multimedia)
|
||||
Requires: cmake(Qt6MultimediaWidgets)
|
||||
Requires: cmake(Qt6Nfc)
|
||||
Requires: cmake(Qt6Positioning)
|
||||
Requires: cmake(Qt6Qml)
|
||||
Requires: cmake(Qt6Quick)
|
||||
Requires: cmake(Qt6Quick3D)
|
||||
Requires: cmake(Qt6QuickWidgets)
|
||||
Requires: cmake(Qt6RemoteObjects)
|
||||
Requires: cmake(Qt6Sensors)
|
||||
Requires: cmake(Qt6SerialPort)
|
||||
Requires: cmake(Qt6Svg)
|
||||
Requires: cmake(Qt6WebChannel)
|
||||
Requires: cmake(Qt6WebSockets)
|
||||
# SECTION not packaged for 6.2 yet
|
||||
# Requires: cmake(Qt6Quick3D)
|
||||
# Requires: cmake(Qt6Quick3DRuntimeRender)
|
||||
# / SECTION
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun):update-alternatives
|
||||
Recommends: python-qscintilla-qt6
|
||||
|
Loading…
Reference in New Issue
Block a user