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

Accepting request 906444 from KDE:Qt:PyQt

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/906444
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-PyQt6?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2021-07-15 22:00:41 +00:00 committed by Git OBS Bridge
commit 1d1f59b580
3 changed files with 85 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
PyQt6-6.1.1-OpenGL_ES2.patch Normal file
View File

@ -0,0 +1,68 @@
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

7
python-PyQt6.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 14 22:42:04 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Add PyQt6-6.1.1-OpenGL_ES2.patch for building ARM with OpenGL ES2
https://www.riverbankcomputing.com/pipermail/pyqt/2021-July/044117.html
- first obs service cleaned specfile commit
-------------------------------------------------------------------
Tue Jul 6 11:52:55 UTC 2021 - Ben Greiner <code@bnavigator.de>

18
python-PyQt6.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package python-PyQt6
# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@ -24,7 +24,7 @@ Name: python-%{mname}
Version: 6.1.1
Release: 0
Summary: Python bindings for Qt 6
License: SUSE-GPL-2.0-with-FLOSS-exception OR GPL-3.0-only OR NonFree
License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
Group: Development/Libraries/Python
URL: https://www.riverbankcomputing.com/software/pyqt
Source: https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-%{version}.tar.gz
@ -32,9 +32,13 @@ 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 PyQt6-sip}
BuildRequires: %{python_module pyqt-builder >= 1.8}
BuildRequires: %{python_module sip-devel >= 6}
BuildRequires: dbus-1-devel
BuildRequires: dos2unix
BuildRequires: fdupes
@ -51,9 +55,6 @@ BuildRequires: cmake(Qt6Quick3D)
BuildRequires: cmake(Qt6Quick3DRuntimeRender)
BuildRequires: cmake(Qt6QuickWidgets)
BuildRequires: cmake(Qt6Svg)
BuildRequires: %{python_module pyqt-builder >= 1.8}
BuildRequires: %{python_module sip-devel >= 6}
BuildRequires: %{python_module PyQt6-sip}
Requires: python-PyQt6-sip
%requires_ge python-dbus-python
Provides: python-qt6 = %{version}-%{release}
@ -65,12 +66,12 @@ PyQt is a set of Python bindings for the Qt framework.
%package devel
Summary: PyQt - devel part of python bindings for Qt 6
Group: Development/Libraries/Python
Requires: qt6-base-devel
Requires: qt6-macros
Requires: python-%{mname} = %{version}
Requires: python-dbus-python-devel >= 0.8
Requires: python-devel
Requires: python-sip-devel >= 6
Requires: qt6-base-devel
Requires: qt6-macros
Requires: cmake(Qt6Designer)
Requires: cmake(Qt6Help)
Requires: cmake(Qt6Qml)
@ -131,7 +132,6 @@ $python -c 'from PyQt6 import QtCore; assert QtCore.PYQT_VERSION_STR == "%{versi
%postun devel
%python_uninstall_alternative pyuic6
%files %{python_files}
%license LICENSE
%doc README NEWS ChangeLog