From e199d801f8a5bd06b2bee3ab9ef89ea9271c902d Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Thu, 10 May 2018 08:36:06 +0000 Subject: 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 Signed-off-by: Martin Jansa --- ...sip-fix-build-with-accessibility-disabled.patch | 35 ----------- recipes-python/pyqt5/files/fix-sm.patch | 17 ------ recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 68 +++++++++++++++++++++ recipes-python/pyqt5/python-pyqt5_5.8.2.bb | 70 ---------------------- 4 files changed, 68 insertions(+), 122 deletions(-) delete mode 100644 recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch delete mode 100644 recipes-python/pyqt5/files/fix-sm.patch create mode 100644 recipes-python/pyqt5/python-pyqt5_5.10.1.bb delete mode 100644 recipes-python/pyqt5/python-pyqt5_5.8.2.bb 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 @@ -From 8a2f852417414e19d060da66cd7c5cba76e43c7d Mon Sep 17 00:00:00 2001 -From: Diego Rondini -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 ---- - 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 - 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 @@ ---- 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 -) diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb new file mode 100644 index 00000000..9a0f8499 --- /dev/null +++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb @@ -0,0 +1,68 @@ +SUMMARY = "Python Qt5 Bindings" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +HOMEPAGE = "http://riverbankcomputing.co.uk" +SECTION = "devel/python" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ +" +DEPENDS = "sip sip-native qtbase python" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "be36c2abaffc9daa8b993f1ca982968f" +SRC_URI[sha256sum] = "9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef" + +S = "${WORKDIR}/PyQt5_gpl-${PV}" + + +inherit qmake5 pythonnative python-dir distro_features_check +# depends on qt4-x11-free +REQUIRED_DISTRO_FEATURES = "x11" + +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + +DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" + +DISABLED_FEATURES_append_arm = " PyQt_qreal_double" + +PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" +PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" + +do_configure_prepend() { + cd ${S} + echo "py_platform = linux" > pyqt.cfg + echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "py_pylib_lib = python%(py_major).%(py_minor)mu" >> pyqt.cfg + echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg + echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg + echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg + echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg + echo "qt_shared = True" >> pyqt.cfg + QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` + echo "[Qt $QT_VERSION]" >> pyqt.cfg + echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg + echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} +} + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + cd ${S} + oe_runmake install +} + +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/" + diff --git a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb deleted file mode 100644 index fdfa1205..00000000 --- a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "Python Qt5 Bindings" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -HOMEPAGE = "http://riverbankcomputing.co.uk" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ -" -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" - -S = "${WORKDIR}/PyQt5_gpl-${PV}" - - -inherit qmake5 pythonnative python-dir distro_features_check -# depends on qt4-x11-free -REQUIRED_DISTRO_FEATURES = "x11" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" - -DISABLED_FEATURES_append_arm = " PyQt_qreal_double" - -PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" -PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" - -do_configure_prepend() { - cd ${S} - echo "py_platform = linux" > pyqt.cfg - echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_lib = python%(py_major).%(py_minor)mu" >> pyqt.cfg - echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg - echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg - echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg - echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg - echo "qt_shared = True" >> pyqt.cfg - QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` - echo "[Qt $QT_VERSION]" >> pyqt.cfg - echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg - echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} -} - -do_compile() { - cd ${S} - oe_runmake -} - -do_install() { - cd ${S} - oe_runmake install -} - -RDEPENDS_${PN} = "python-core python-sip" - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/" - -- cgit v1.2.3-54-g00ecf