packages/python-qt5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Pyqt5 5.15.6

Browse Source
This commit is contained in:
wk333 2022-04-18 16:34:55 +08:00
parent 3db94f888f
commit 4c11d1c2bf
6 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PyQt5-5.15.6.tar.gz Normal file
View File

Binary file not shown.

12
PyQt5-Timeline.patch
View File

@ -1,12 +0,0 @@
diff -up PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip
--- PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip.Timeline 2018-07-10 15:25:49.295960286 -0500
+++ PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip 2018-07-10 15:26:22.781340757 -0500
@@ -22,7 +22,7 @@
%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1}
+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2}
%Platforms {WS_X11 WS_WIN WS_MACX}

21
PyQt5_gpl-5.11.2-sip_check.patch
View File

@ -1,21 +0,0 @@
diff -up PyQt5_gpl-5.11.2/configure.py.sip_check PyQt5_gpl-5.11.2/configure.py
--- PyQt5_gpl-5.11.2/configure.py.sip_check 2018-07-11 14:10:21.751437714 -0500
+++ PyQt5_gpl-5.11.2/configure.py 2018-07-11 14:12:13.035482279 -0500
@@ -647,7 +647,7 @@ class TargetConfiguration:
try:
from PyQt5 import sip
except ImportError:
- error(
+ inform(
"Unable to import PyQt5.sip. Make sure you have "
"configured SIP to create a private copy of the sip "
"module.")
@@ -2919,7 +2919,7 @@ def check_sip(target_config):
try:
from PyQt5 import sip
except ImportError:
- error(
+ inform(
"Unable to import PyQt5.sip. Make sure you have configured "
"SIP to create a private copy of the sip module.")

BIN
PyQt5_gpl-5.11.2.tar.gz
View File

Binary file not shown.

26
fix-qcborcommon.patch Normal file
View File

@ -0,0 +1,26 @@
From f5c41c5d50608eb65c271e51ed6dfdcd885ead55 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Mon, 7 Mar 2022 18:46:16 +0800
Subject: [PATCH 1/1] test
---
sip/QtCore/qcborcommon.sip | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sip/QtCore/qcborcommon.sip b/sip/QtCore/qcborcommon.sip
index 057c6c1..318e61a 100644
--- a/sip/QtCore/qcborcommon.sip
+++ b/sip/QtCore/qcborcommon.sip
@@ -30,8 +30,8 @@
enum class QCborSimpleType
{
- False /PyName=False_/,
- True /PyName=True_/,
+ False_QCb /PyName=False_/,
+ True_QCb /PyName=True_/,
Null,
Undefined,
};
--
2.27.0

22
python-qt5.spec
View File

@ -8,24 +8,18 @@
%global py3_site_qt5 %{python3_sitearch}/PyQt5
Name: python-qt5
Version: 5.11.2
Release: 10
Version: 5.15.6
Release: 1
Summary: PyQt5 is a set of Python bindings for Qt5
License: GPLv3
Url: http://www.riverbankcomputing.com/software/pyqt/
%if 0%{?snap:1}
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-%{version}%{?snap:.%{snap}}.tar.gz
%else
Source0: https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-%{version}/PyQt5_gpl-%{version}.tar.gz/download?use_mirror=netactuate#/PyQt5_gpl-%{version}.tar.gz
%endif
Source0: https://pypi.python.org/packages/source/P/PyQt5/PyQt5-%{version}.tar.gz
Source1: macros.pyqt5
Source2: pylupdate5.sh
Source3: pyrcc5.sh
Source4: pyuic5.sh
Patch0: PyQt5-Timeline.patch
Patch1: PyQt5_gpl-5.11.2-sip_check.patch
Patch0: fix-qcborcommon.patch
BuildRequires: chrpath findutils dbus-devel dbus-python-devel phonon-qt5-devel qt5-qttools-devel
BuildRequires: qt5-qtbase-devel >= 5.5 qt5-qtenginio-devel qt5-qtconnectivity-devel
@ -117,7 +111,7 @@ Obsoletes: python3-qt5 < 5.5.1-10
Python v3 bindings for Qt5 Webkit.
%prep
%autosetup -n PyQt5_gpl-%{version}%{?snap:.%{snap}} -p1
%autosetup -n PyQt5-%{version} -p1
%build
export PATH="%{_qt5_bindir}:$PATH"
@ -129,7 +123,8 @@ pushd %{_target_platform}-python3
--assume-shared --confirm-license --no-dist-info --qmake=%{_qt5_qmake} \
--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \
%{?py3_sipdir:--sipdir=%{py3_sipdir}} --verbose QMAKE_CFLAGS_RELEASE="%{optflags}" \
QMAKE_CXXFLAGS_RELEASE="%{optflags}" QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}"
QMAKE_CXXFLAGS_RELEASE="%{optflags} `pkg-config --cflags dbus-python`"\
QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}"
%make_build
popd
@ -245,6 +240,9 @@ popd
%doc %{_qt5_datadir}/qsci/api/python/PyQt5.api
%changelog
* Tue Mar 08 2022 wangkai <wangkai385@huawei.com> - 5.15.6-1
- Update to Pyqt5 5.15.6
* Tue Jan 11 2022 xu_ping <xuping33@huawei.com> - 5.11.2-10
- Fix compilation failures using pulseaudio-libs-devel instead of pulseaudio-devel