From 02715fff5ee26e8baa03420083f6aa60b45c13ea Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 9 Nov 2019 11:55:19 -0800
Subject: pyqt5: Upgrade to 5.13.2

Blacklist py2 version, it does not build and py2 is on its way out in
Jan 2020 anyway

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-python/pyqt5/python-pyqt5.inc        | 9 +++++----
 recipes-python/pyqt5/python-pyqt5_5.12.1.bb  | 8 --------
 recipes-python/pyqt5/python-pyqt5_5.13.2.bb  | 9 +++++++++
 recipes-python/pyqt5/python3-pyqt5_5.12.1.bb | 7 -------
 recipes-python/pyqt5/python3-pyqt5_5.13.2.bb | 7 +++++++
 5 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 recipes-python/pyqt5/python-pyqt5_5.12.1.bb
 create mode 100644 recipes-python/pyqt5/python-pyqt5_5.13.2.bb
 delete mode 100644 recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
 create mode 100644 recipes-python/pyqt5/python3-pyqt5_5.13.2.bb

(limited to 'recipes-python/pyqt5')

diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
index bbeb75af..b830c9a9 100644
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ b/recipes-python/pyqt5/python-pyqt5.inc
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "\
     file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
 "
 SRC_URI = "\
-    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5_gpl-${PV}.tar.gz \
+    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \
 "
-SRC_URI[md5sum] = "67508b652098d2e05c4c2b5baeb170cc"
-SRC_URI[sha256sum] = "3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f506e59bf"
-S = "${WORKDIR}/PyQt5_gpl-${PV}"
+SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0"
+SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827"
+
+S = "${WORKDIR}/PyQt5-${PV}"
 
 inherit qmake5
 DEPENDS = "qtbase qtdeclarative qtquickcontrols2"
diff --git a/recipes-python/pyqt5/python-pyqt5_5.12.1.bb b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
deleted file mode 100644
index 6b1b5701..00000000
--- a/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require python-pyqt5.inc
-
-inherit pythonnative python-dir
-
-DEPENDS += "sip sip-native python"
-
-RDEPENDS_${PN} += "python-core python-sip"
-
diff --git a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
new file mode 100644
index 00000000..b8b1d086
--- /dev/null
+++ b/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
@@ -0,0 +1,9 @@
+require python-pyqt5.inc
+
+inherit pythonnative python-dir
+
+DEPENDS += "sip sip-native python"
+
+RDEPENDS_${PN} += "python-core python-sip"
+
+PNBLACKLIST[python-pyqt5] = "Sip fails in do_configure sip: QOpenGLFramebufferObject is undefined"
diff --git a/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb b/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
deleted file mode 100644
index 200a8154..00000000
--- a/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require python-pyqt5.inc
-
-inherit python3native python3-dir
-
-DEPENDS += "sip3 sip3-native python3"
-
-RDEPENDS_${PN} += "python3-core python3-sip3"
diff --git a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb
new file mode 100644
index 00000000..200a8154
--- /dev/null
+++ b/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb
@@ -0,0 +1,7 @@
+require python-pyqt5.inc
+
+inherit python3native python3-dir
+
+DEPENDS += "sip3 sip3-native python3"
+
+RDEPENDS_${PN} += "python3-core python3-sip3"
-- 
cgit v1.2.3-54-g00ecf