mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-06-21 08:52:35 +02:00
python-pyqt5: update recipe to 5.10.1
Update recipe to version 5.10.1, removing upstreamed patches in the process. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
65db89eb7b
commit
e199d801f8
@@ -1,35 +0,0 @@
|
||||
From 8a2f852417414e19d060da66cd7c5cba76e43c7d Mon Sep 17 00:00:00 2001
|
||||
From: Diego Rondini <diego.rondini@kynetics.com>
|
||||
Date: Wed, 19 Jul 2017 14:17:51 +0200
|
||||
Subject: [PATCH] qtabbar.sip: fix build with accessibility disabled
|
||||
|
||||
Upstream-Status: Submitted
|
||||
|
||||
Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
|
||||
---
|
||||
sip/QtWidgets/qtabbar.sip | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/sip/QtWidgets/qtabbar.sip b/sip/QtWidgets/qtabbar.sip
|
||||
index ffe2d3b..80ad816 100644
|
||||
--- a/sip/QtWidgets/qtabbar.sip
|
||||
+++ b/sip/QtWidgets/qtabbar.sip
|
||||
@@ -166,11 +166,15 @@ protected:
|
||||
|
||||
public:
|
||||
%If (Qt_5_8_0 -)
|
||||
+%If (PyQt_Accessibility)
|
||||
QString accessibleTabName(int index) const;
|
||||
%End
|
||||
+%End
|
||||
%If (Qt_5_8_0 -)
|
||||
+%If (PyQt_Accessibility)
|
||||
void setAccessibleTabName(int index, const QString &name);
|
||||
%End
|
||||
+%End
|
||||
|
||||
private:
|
||||
QTabBar(const QTabBar &);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
--- PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip.orig 2017-05-13 13:28:42.523392315 -0400
|
||||
+++ PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip 2017-05-13 13:30:08.081207211 -0400
|
||||
@@ -270,12 +270,14 @@
|
||||
%End
|
||||
|
||||
public:
|
||||
+%If (PyQt_SessionManager)
|
||||
%If (Qt_5_6_0 -)
|
||||
static bool isFallbackSessionManagementEnabled();
|
||||
%End
|
||||
%If (Qt_5_6_0 -)
|
||||
static void setFallbackSessionManagementEnabled(bool);
|
||||
%End
|
||||
+%End
|
||||
|
||||
signals:
|
||||
%If (Qt_5_6_0 -)
|
||||
@@ -10,11 +10,9 @@ DEPENDS = "sip sip-native qtbase python"
|
||||
|
||||
SRC_URI = "\
|
||||
${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \
|
||||
file://fix-sm.patch \
|
||||
file://0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a"
|
||||
SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8"
|
||||
SRC_URI[md5sum] = "be36c2abaffc9daa8b993f1ca982968f"
|
||||
SRC_URI[sha256sum] = "9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef"
|
||||
|
||||
S = "${WORKDIR}/PyQt5_gpl-${PV}"
|
||||
|
||||
@@ -63,7 +61,7 @@ do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} = "python-core python-sip"
|
||||
RDEPENDS_${PN} = "python-core python-sip qtbase"
|
||||
|
||||
FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
|
||||
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/"
|
||||
Reference in New Issue
Block a user