diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-02-19 18:19:02 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-02-19 18:19:36 +0100 |
| commit | 25d0fa60578b412a509c0ef0465fc6e5499bac3d (patch) | |
| tree | a9f230f67234f165a419257f0a842b09fc8d7cd2 | |
| parent | a582fd4c810529e9af0c81700407b1955d1391d2 (diff) | |
| download | meta-qt5-25d0fa60578b412a509c0ef0465fc6e5499bac3d.tar.gz | |
Revert "pyqt5: Upgrade to 5.13.2"
This reverts commit 02715fff5ee26e8baa03420083f6aa60b45c13ea.
This version is too new for sip version in meta-oe/zeus:
Error: This version of PyQt5 requires sip 4.19.19 or later.
It was accidentally merged with other build fixes when re-syncing
master and zeus before 5.14 upgrade in master.
This is needed also for the newly added python-pyqtchart recipe.
| -rw-r--r-- | recipes-python/pyqt5/python-pyqt5.inc | 9 | ||||
| -rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.12.1.bb (renamed from recipes-python/pyqt5/python-pyqt5_5.13.2.bb) | 1 | ||||
| -rw-r--r-- | recipes-python/pyqt5/python3-pyqt5_5.12.1.bb (renamed from recipes-python/pyqt5/python3-pyqt5_5.13.2.bb) | 0 |
3 files changed, 4 insertions, 6 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc index b830c9a9..bbeb75af 100644 --- a/recipes-python/pyqt5/python-pyqt5.inc +++ b/recipes-python/pyqt5/python-pyqt5.inc | |||
| @@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "\ | |||
| 7 | file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ | 7 | file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ |
| 8 | " | 8 | " |
| 9 | SRC_URI = "\ | 9 | SRC_URI = "\ |
| 10 | https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \ | 10 | https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5_gpl-${PV}.tar.gz \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0" | 12 | SRC_URI[md5sum] = "67508b652098d2e05c4c2b5baeb170cc" |
| 13 | SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827" | 13 | SRC_URI[sha256sum] = "3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f506e59bf" |
| 14 | 14 | S = "${WORKDIR}/PyQt5_gpl-${PV}" | |
| 15 | S = "${WORKDIR}/PyQt5-${PV}" | ||
| 16 | 15 | ||
| 17 | inherit qmake5 | 16 | inherit qmake5 |
| 18 | DEPENDS = "qtbase qtdeclarative qtquickcontrols2" | 17 | DEPENDS = "qtbase qtdeclarative qtquickcontrols2" |
diff --git a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb index b8b1d086..6b1b5701 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb | |||
| @@ -6,4 +6,3 @@ DEPENDS += "sip sip-native python" | |||
| 6 | 6 | ||
| 7 | RDEPENDS_${PN} += "python-core python-sip" | 7 | RDEPENDS_${PN} += "python-core python-sip" |
| 8 | 8 | ||
| 9 | PNBLACKLIST[python-pyqt5] = "Sip fails in do_configure sip: QOpenGLFramebufferObject is undefined" | ||
diff --git a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb index 200a8154..200a8154 100644 --- a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb +++ b/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb | |||