summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch35
-rw-r--r--recipes-python/pyqt5/files/fix-sm.patch17
-rw-r--r--recipes-python/pyqt5/python-pyqt5_5.10.1.bb (renamed from recipes-python/pyqt5/python-pyqt5_5.8.2.bb)8
3 files changed, 3 insertions, 57 deletions
diff --git a/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch b/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch
deleted file mode 100644
index 7e1c7bf4..00000000
--- a/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 8a2f852417414e19d060da66cd7c5cba76e43c7d Mon Sep 17 00:00:00 2001
2From: Diego Rondini <diego.rondini@kynetics.com>
3Date: Wed, 19 Jul 2017 14:17:51 +0200
4Subject: [PATCH] qtabbar.sip: fix build with accessibility disabled
5
6Upstream-Status: Submitted
7
8Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
9---
10 sip/QtWidgets/qtabbar.sip | 4 ++++
11 1 file changed, 4 insertions(+)
12
13diff --git a/sip/QtWidgets/qtabbar.sip b/sip/QtWidgets/qtabbar.sip
14index ffe2d3b..80ad816 100644
15--- a/sip/QtWidgets/qtabbar.sip
16+++ b/sip/QtWidgets/qtabbar.sip
17@@ -166,11 +166,15 @@ protected:
18
19 public:
20 %If (Qt_5_8_0 -)
21+%If (PyQt_Accessibility)
22 QString accessibleTabName(int index) const;
23 %End
24+%End
25 %If (Qt_5_8_0 -)
26+%If (PyQt_Accessibility)
27 void setAccessibleTabName(int index, const QString &name);
28 %End
29+%End
30
31 private:
32 QTabBar(const QTabBar &);
33--
342.7.4
35
diff --git a/recipes-python/pyqt5/files/fix-sm.patch b/recipes-python/pyqt5/files/fix-sm.patch
deleted file mode 100644
index f2936a23..00000000
--- a/recipes-python/pyqt5/files/fix-sm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1--- PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip.orig 2017-05-13 13:28:42.523392315 -0400
2+++ PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip 2017-05-13 13:30:08.081207211 -0400
3@@ -270,12 +270,14 @@
4 %End
5
6 public:
7+%If (PyQt_SessionManager)
8 %If (Qt_5_6_0 -)
9 static bool isFallbackSessionManagementEnabled();
10 %End
11 %If (Qt_5_6_0 -)
12 static void setFallbackSessionManagementEnabled(bool);
13 %End
14+%End
15
16 signals:
17 %If (Qt_5_6_0 -)
diff --git a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb
index fdfa1205..9a0f8499 100644
--- a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb
+++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb
@@ -10,11 +10,9 @@ DEPENDS = "sip sip-native qtbase python"
10 10
11SRC_URI = "\ 11SRC_URI = "\
12 ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ 12 ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \
13 file://fix-sm.patch \
14 file://0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch \
15" 13"
16SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a" 14SRC_URI[md5sum] = "be36c2abaffc9daa8b993f1ca982968f"
17SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" 15SRC_URI[sha256sum] = "9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef"
18 16
19S = "${WORKDIR}/PyQt5_gpl-${PV}" 17S = "${WORKDIR}/PyQt5_gpl-${PV}"
20 18
@@ -63,7 +61,7 @@ do_install() {
63 oe_runmake install 61 oe_runmake install
64} 62}
65 63
66RDEPENDS_${PN} = "python-core python-sip" 64RDEPENDS_${PN} = "python-core python-sip qtbase"
67 65
68FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" 66FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
69FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/" 67FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/"