From 6a1a387a506f62c66a00c6935dd476a39811cd7e Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Wed, 13 Feb 2019 18:11:43 -0500
Subject: python-pyqt: Fix annoying problems.

 * Python ABI only applies to include files.

Signed-off-by: Philip Balister <philip@opensdr.com>
---
 recipes-python/pyqt5/python-pyqt5.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'recipes-python/pyqt5/python-pyqt5.inc')

diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
index 4b1630d4..15897ed5 100644
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ b/recipes-python/pyqt5/python-pyqt5.inc
@@ -34,13 +34,13 @@ 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${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
-    echo "py_pylib_dir = %(sysroot)/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
-    echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
-    echo "pyqt_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> pyqt.cfg
+    echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
+    echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> 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${PYTHON_BASEVERSION}${PYTHON_ABI}" >> 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`
@@ -59,6 +59,6 @@ do_install() {
     oe_runmake MAKEFLAGS='-j 1' install
 }
 
-FILES_${PN} += "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages ${datadir}/sip/PyQt5/"
+FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
 
 RDEPENDS_${PN} = "qtbase"
-- 
cgit v1.2.3-54-g00ecf


From ba08444f429c788294996c90d8e46047d458f5c9 Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Wed, 13 Feb 2019 19:01:37 -0500
Subject: python-pyqt5: Update to version 5.12.1.

Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-python/pyqt5/python-pyqt5.inc        | 7 +++----
 recipes-python/pyqt5/python-pyqt5_5.11.3.bb  | 8 --------
 recipes-python/pyqt5/python-pyqt5_5.12.1.bb  | 8 ++++++++
 recipes-python/pyqt5/python3-pyqt5_5.11.3.bb | 7 -------
 recipes-python/pyqt5/python3-pyqt5_5.12.1.bb | 7 +++++++
 5 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 recipes-python/pyqt5/python-pyqt5_5.11.3.bb
 create mode 100644 recipes-python/pyqt5/python-pyqt5_5.12.1.bb
 delete mode 100644 recipes-python/pyqt5/python3-pyqt5_5.11.3.bb
 create mode 100644 recipes-python/pyqt5/python3-pyqt5_5.12.1.bb

(limited to 'recipes-python/pyqt5/python-pyqt5.inc')

diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
index 15897ed5..11d246d7 100644
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ b/recipes-python/pyqt5/python-pyqt5.inc
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "\
     file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
 "
 SRC_URI = "\
-    ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \
+    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5_gpl-${PV}.tar.gz \
 "
-SRC_URI[md5sum] = "aac3428e90eca5df68c5764282fd9b98"
-SRC_URI[sha256sum] = "c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073"
-
+SRC_URI[md5sum] = "67508b652098d2e05c4c2b5baeb170cc"
+SRC_URI[sha256sum] = "3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f506e59bf"
 S = "${WORKDIR}/PyQt5_gpl-${PV}"
 
 inherit qmake5
diff --git a/recipes-python/pyqt5/python-pyqt5_5.11.3.bb b/recipes-python/pyqt5/python-pyqt5_5.11.3.bb
deleted file mode 100644
index 6b1b5701..00000000
--- a/recipes-python/pyqt5/python-pyqt5_5.11.3.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.12.1.bb b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
new file mode 100644
index 00000000..6b1b5701
--- /dev/null
+++ b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
@@ -0,0 +1,8 @@
+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/python3-pyqt5_5.11.3.bb b/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb
deleted file mode 100644
index 200a8154..00000000
--- a/recipes-python/pyqt5/python3-pyqt5_5.11.3.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.12.1.bb b/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
new file mode 100644
index 00000000..200a8154
--- /dev/null
+++ b/recipes-python/pyqt5/python3-pyqt5_5.12.1.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