package/python-sip: bump to version 4.19.25
PATCH 1/2 package/python-sip: bump to version 4.19.25
This version is the minimum version needed to support newer versions of PyQT.
Changes:
- Update the URL as this version is not hosted on sourceforge.
- Add --no-stubs to prevent the error: No such file or directory: sip.pyi
- Add 0001-remove-join-from-sip-h-files-string.patch to prevent python-sip from attempting to copy the entire hosts /usr directory when installing.
--- ...-remove-join-from-sip-h-files-string.patch | 33 +++++++++++++++++++ package/python-sip/python-sip.hash | 10 +++--- package/python-sip/python-sip.mk | 6 ++-- 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 package/python-sip/0001-remove-join-from-sip-h-files-string.patch
package/python-sip/0001-remove-join-from-sip-h-files-string.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 009e5cf0750134ed5403aae23ef53a177764ca04 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Wed, 29 Dec 2021 13:49:15 -0800 +Subject: [PATCH] remove join from sip_h.files string + +When cross compiling, the configure system appends the hosts /usr/ directory +to the path of which to find files that python-sip will install. This leads to +python-sip attempting to install everything under the hosts /usr directory into +the targets /usr/include/python directory. + +Remove the .join() in the sip_h.files string to prevent the above issue. + +Signed-off-by: Adam Duskett <[email protected]> +--- + configure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index 25bcaa7..fc8f2dc 100644 +--- a/configure.py ++++ b/configure.py +@@ -408,7 +408,7 @@ def create_makefiles(macros): + # There will only be one element. + files, path = gen_installs[0] + pro.write("\n") +- pro.write("sip_h.files = %s\n" % " ".join(files)) ++ pro.write("sip_h.files = %s\n" % files) + pro.write("sip_h.path = %s\n" % quote(path)) + pro.write("INSTALLS += sip_h\n") + +-- +2.33.1 +
package/python-sip/python-sip.hash +4 -6
@@ -1,7 +1,5 @@ -# From https://sourceforge.net/projects/pyqt/files/sip/sip-4.18/ -md5 78724bf2a79878201c3bc81a1d8248ea sip-4.18.tar.gz # Locally calculated: -sha256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 sip-4.18.tar.gz -sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE -sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 -sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3 +sha256 b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211 sip-4.19.25.tar.gz +sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE +sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 +sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3
package/python-sip/python-sip.mk +3 -3
@@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_SIP_VERSION = 4.18 +PYTHON_SIP_VERSION = 4.19.25 PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz -PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION) +PYTHON_SIP_SITE = https://www.riverbankcomputing.com/static/Downloads/sip/$(PYTHON_SIP_VERSION) PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 - PYTHON_SIP_DEPENDENCIES = python3 qt5base HOST_PYTHON_SIP_DEPENDENCIES = host-python3
@@ -34,6 +33,7 @@ define PYTHON_SIP_CONFIGURE_CMDS --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ + --no-stubs \ --use-qmake && \ $(HOST_DIR)/bin/qmake) endef
Signature · 6 lines
2.36.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/2 package/python-pyqt5: bump to version 5.15.6
- Change the site from sourceforge to pypi.
- Remove upstream or uneeded patches.
- Change qtdetail.out to qtcore, as the qtdetail.out file is now QtCore.out
- Remove the QtWebEngineCore module, as the module has been moved to a separat PyQtWebEngine package.
- Add the --assume-shared option as Buildroot forces QT5 to be built as a shared library.
- Parallel install is not supported, as some install targets depend on previously installed targets first.
Tested with test-pkg -p python-pyqt5 -a in an ubuntu 20.04 container. 45 builds, 10 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
--- .../0001-configure-skip-qtdetail.patch | 37 +++++++++------ .../0002-fix-QtCoremod.sip-syntax-error.patch | 29 ++++++++++++ package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ----------- ...uttonHint-and-WindowCancelButtonHint.patch | 27 ----------- ...drop-qttest-qtestmouse-waitforevents.patch | 32 ------------- package/python-pyqt5/python-pyqt5.hash | 10 ++-- package/python-pyqt5/python-pyqt5.mk | 47 +++++++++---------- 7 files changed, 78 insertions(+), 132 deletions(-) create mode 100644 package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch delete mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch delete mode 100644 package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch
package/python-pyqt5/0001-configure-skip-qtdetail.patch +23 -14
@@ -1,4 +1,8 @@ -Do not run qtdetail +From 7ed5e15f2de747e383ba7eee66b646a7a66e6654 Mon Sep 17 00:00:00 2001 +From: Sergey Kostanbaev <[email protected]> +Date: Wed, 29 Dec 2021 12:30:12 -0800 +Subject: [PATCH] Do not run qtdetail + qtdetail is a tool that generates qtdetail.out. Since this program is cross-compiled, it's not possible to run it on the host.
@@ -11,19 +15,24 @@ file is kept, and that qtdetail is not executed. Signed-off-by: Gwenhael Goavec-Merou <[email protected]> Signed-off-by: Sergey Kostanbaev <[email protected]> ---- -Index: PyQt5_gpl-5.7/configure.py -=================================================================== ---- PyQt5_gpl-5.7.orig/configure.py -+++ PyQt5_gpl-5.7/configure.py -@@ -672,10 +672,6 @@ int main(int argc, char **argv) - if cmd is None: - error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") +Signed-off-by: Adam Duskett <[email protected]> +Refresh for 5.15.6 + +diff --git a/configure.py b/configure.py +index daa0f94..32f5b21 100644 +--- a/configure.py ++++ b/configure.py +@@ -2455,10 +2455,6 @@ def run_test_program(mname, test, verbose): -- # Create the output file, first making sure it doesn't exist. -- remove_file(out_file) -- run_command(cmd, verbose) + out_file = 'cfgtest_' + mname + '.out' + +- # Create the output file, first making sure it doesn't exist. +- remove_file(out_file) +- run_command(test + ' ' + out_file, verbose) - - if not os.access(out_file, os.F_OK): - error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file)) + if not os.access(out_file, os.F_OK): + error("%s failed to create %s. Make sure your Qt installation is correct." % (test, out_file)) +-- +2.33.1 +
package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch new file +29 -0
@@ -0,0 +1,29 @@ +From d004e17cd92f660cb386d91e14729a03cab087d4 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Sun, 22 May 2022 13:23:27 -0700 +Subject: [PATCH] fix QtCoremod.sip syntax error + +Fixes PyQt5/bindings/QtCore/QtCoremod.sip:23: syntax error from the +python-sip-4 package. + +Signed-off-by: Adam Duskett <[email protected]> +--- + sip/QtCore/QtCoremod.sip | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +index b525bc5..1e2b8ba 100644 +--- a/sip/QtCore/QtCoremod.sip ++++ b/sip/QtCore/QtCoremod.sip +@@ -20,7 +20,7 @@ + // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +-%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True) ++%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) + + %Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_0 Qt_5_15_0} + +-- +2.36.1 +
package/python-pyqt5/0002-fix-qt-5.6.2.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Fix the build with Qt 5.6.{2,3} - -Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to -work, but currently fails in practice. In fact, this is due to the -fact that the %Timeline variable in QtCoremod.sip didn't contain the -5.6.{2,3} Qt versions, so if this version was used, PyQt was assuming it -was the later version 5.7, and therefore started enabling APIs only -available in Qt 5.7, causing build failures when building against Qt -5.6.{2,3}. - -Adding Qt_5_6_2 and Qt_5_6_3 to the timeline fixes this problem. This -fix was suggested by Phil Thompson <[email protected]>. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 -+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} -
package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati <[email protected]> -Date: Mon, 30 Jan 2017 18:28:15 +0100 -Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from - qnamespace.sip as they are removed from qt5.8 - -Signed-off-by: Zoltan Gyarmati <[email protected]> ---- - sip/QtCore/qnamespace.sip | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip -index 2db83b7..559f410 100644 ---- a/sip/QtCore/qnamespace.sip -+++ b/sip/QtCore/qnamespace.sip -@@ -209,8 +209,6 @@ namespace Qt - WindowContextHelpButtonHint, - WindowShadeButtonHint, - WindowStaysOnTopHint, -- WindowOkButtonHint, -- WindowCancelButtonHint, - WindowStaysOnBottomHint, - WindowCloseButtonHint, - MacWindowToolBarButtonHint, --- -2.7.4 -
package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch deleted +0 -32
@@ -1,32 +0,0 @@ -Drop waitForEvents() method from qtestmouse - -This method was dropped in Qt 5.11: - - https://github.com/qt/qtbase/commit/75e583b3fcbdbbb999633eb5f2267720dd695cfa - -However, Python PyQt5 still generates a wrapper for it, causing a -build failure. The upstream PyQt5 maintainers have not kept -waitForEvents() support for older Qt versions, and instead entirely -dropped it unconditionally. This can be verified by diffing PyQt 5.10 -and PyQt 5.11. We take the same approach, and drop waitForEvents() -unconditionally, even when PyQt5 is built against the older Qt 5.6. - -Fedora is using a similar solution: -https://src.fedoraproject.org/rpms/python-qt5/c/47fb7fdc5d16582772f9c3fc8a6a674a41a7f605?branch=master. - -This patch can be dropped when PyQt5 is bumped to its 5.11 version. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/sip/QtTest/qtestmouse.sip -=================================================================== ---- a/sip/QtTest/qtestmouse.sip -+++ b/sip/QtTest/qtestmouse.sip -@@ -41,7 +41,6 @@ - void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); -- void waitForEvents() /ReleaseGIL/; - void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); - void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
package/python-pyqt5/python-pyqt5.hash +5 -5
@@ -1,6 +1,6 @@ -# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed -md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz -sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz +# From https://pypi.org/pypi/PyQt5/json +md5 0c7fca60aa6ee13c235f68576d9c7bed PyQt5-5.15.6.tar.gz -# Hash for license file -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +# Locally calculated +sha256 80343bcab95ffba619f2ed2467fd828ffeb0a251ad7225be5fc06dcc333af452 PyQt5-5.15.6.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE
package/python-pyqt5/python-pyqt5.mk +21 -26
87 lines not on this page · raw message
Signature · 6 lines
2.36.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedRe: [Buildroot] [PATCH 2/2] package/python-pyqt5: bump to version 5.15.6
Quoted 14 lines · On Mon, 23 May 2022 15:46:46 -0700 Adam Duskett <[email protected]> wrote:
- Change the site from sourceforge to pypi.
- Remove upstream or uneeded patches.
- Change qtdetail.out to qtcore, as the qtdetail.out file is now QtCore.out
- Remove the QtWebEngineCore module, as the module has been moved to a separat PyQtWebEngine package.
- Add the --assume-shared option as Buildroot forces QT5 to be built as a shared library.
- Parallel install is not supported, as some install targets depend on previously installed targets first.Tested with test-pkg -p python-pyqt5 -a in an ubuntu 20.04 container. 45 builds, 10 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
Signed-off-by Adam Duskett <[email protected]>
Quoted 13 lines
--- .../0001-configure-skip-qtdetail.patch | 37 +++++++++------ .../0002-fix-QtCoremod.sip-syntax-error.patch | 29 ++++++++++++ package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ----------- ...uttonHint-and-WindowCancelButtonHint.patch | 27 ----------- ...drop-qttest-qtestmouse-waitforevents.patch | 32 ------------- package/python-pyqt5/python-pyqt5.hash | 10 ++-- package/python-pyqt5/python-pyqt5.mk | 47 +++++++++---------- 7 files changed, 78 insertions(+), 132 deletions(-) create mode 100644 package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch delete mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch delete mode 100644 package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch
Applied to next, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 7 lines · On Mon, 23 May 2022 15:46:45 -0700 Adam Duskett <[email protected]> wrote:
This version is the minimum version needed to support newer versions of PyQT.
Changes:
- Update the URL as this version is not hosted on sourceforge.
- Add --no-stubs to prevent the error: No such file or directory: sip.pyi
- Add 0001-remove-join-from-sip-h-files-string.patch to prevent python-sip from attempting to copy the entire hosts /usr directory when installing.
Quoted 7 lines
Signed-off-by Adam Duskett <[email protected]>--- ...-remove-join-from-sip-h-files-string.patch | 33 +++++++++++++++++++ package/python-sip/python-sip.hash | 10 +++--- package/python-sip/python-sip.mk | 6 ++-- 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 package/python-sip/0001-remove-join-from-sip-h-files-string.patch
Applied to next, thanks. However, I would really like the patch 0001-remove-join-from-sip-h-files-string.patch to be submitted upstream. Of course, it probably can't be accepted upstream as-is, but this can create the discussion that will hopefully lead to an upstream-acceptable solution.
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot