diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-06-07 19:00:38 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-06-07 19:00:38 +0000 |
| commit | c7de950cc674c81d06538441106a69e1bdce00c2 (patch) | |
| tree | 3dc4425973affc40c2fc1e3784006a4517512197 /dev-python/pyside | |
| parent | 400f169d63c91042a3a28670e64b68e92aa12623 (diff) | |
| download | baldeagleos-repo-c7de950cc674c81d06538441106a69e1bdce00c2.tar.gz baldeagleos-repo-c7de950cc674c81d06538441106a69e1bdce00c2.tar.xz baldeagleos-repo-c7de950cc674c81d06538441106a69e1bdce00c2.zip | |
Adding metadata
Diffstat (limited to 'dev-python/pyside')
| -rw-r--r-- | dev-python/pyside/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/pyside/files/pyside-6.9.1-fix-tests-cmake4.patch | 53 | ||||
| -rw-r--r-- | dev-python/pyside/pyside-6.9.1.ebuild (renamed from dev-python/pyside/pyside-6.9.0.ebuild) | 1 |
3 files changed, 55 insertions, 1 deletions
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest index a0a8a1083f76..0f665f659162 100644 --- a/dev-python/pyside/Manifest +++ b/dev-python/pyside/Manifest @@ -1,3 +1,3 @@ DIST pyside-setup-everywhere-src-6.8.2.tar.xz 16609596 BLAKE2B 7e4f12cf81d649e2d7e52ff31eedda55db29650230e5dac2a930d38827d7e43101309a601e0dc3ccebea0274f006f25c9a6be79baa3d0390526dbb8583920230 SHA512 cc522143974d08133d68d3259caa5127916534e16678693866d65965a546db98b5b1b07d92f7c0918b7c8fb10213d94ad50259b22cf9ebc2a63b985068d75452 DIST pyside-setup-everywhere-src-6.8.3.tar.xz 16611768 BLAKE2B 119696fc184c5caa450807dab6acae903a9a2b1e98b5c641659fdb77bfcb855e3a7cb8abb4fbc0d22c5df9312ce924599aff615e28bedd45b9ee30e88dee8b56 SHA512 a7d1bbd0edd8c42e6925bf880e5ee613391fb1d75f2880598577c49fe90d0c0b81907fd4cd3032ba665bcf70a6915e0ee1a8648c7012a28e598d5c7eb6da1bfe -DIST pyside-setup-everywhere-src-6.9.0.tar.xz 16652756 BLAKE2B 38c8580d4e0854d58853ac74568a234f4a9d352e26b49e35eb0b76baaad2e304786dc119bfd00b18b7df006a37d09f4a9a02b89c11f145a8b74b40ecd5c15106 SHA512 b5f574397e0e1a891a3d305d91dc8b91a149bfd6427dde29f2900052a63dc684f238eca511386fdd891d0e343615c1f1b05c050a4aa63f8fcae70075c2ab4f70 +DIST pyside-setup-everywhere-src-6.9.1.tar.xz 16669448 BLAKE2B a98dc9bea7824f2b98becba83ce8cf6488d76fe85ef91e96c1d8b3b6f08fccc57f13116dfb55507e9fbf5d7a82f370418a103a616869fe17b233fff76de3996d SHA512 2069b2154618e49aeeae4ed53e377bf08f7d519aa955dfec0e10603cc5a58abbb32a502b3b4066d0a7cd3bf24b288130c9578d909734a064413578cd6aef7d33 diff --git a/dev-python/pyside/files/pyside-6.9.1-fix-tests-cmake4.patch b/dev-python/pyside/files/pyside-6.9.1-fix-tests-cmake4.patch new file mode 100644 index 000000000000..0355e875db20 --- /dev/null +++ b/dev-python/pyside/files/pyside-6.9.1-fix-tests-cmake4.patch @@ -0,0 +1,53 @@ +https://codereview.qt-project.org/c/pyside/pyside-setup/+/647549 +https://github.com/pyside/pyside-setup/commit/03de4672557d80b34f9c9ef1e654a4117c621e65 + +From 03de4672557d80b34f9c9ef1e654a4117c621e65 Mon Sep 17 00:00:00 2001 +From: Christian Tismer <tismer@stackless.com> +Date: Tue, 20 May 2025 15:25:38 +0200 +Subject: [PATCH] testing: fix finding tests on new cmake versions + +By chance, cmake was installed by homebrew without any restrictions, +and so version 4.0.2 happened to be installed which does no longer +use the option "--force-new-ctest-process". Changed the analysis to +look for "/bin/ctest" instead. This should work for a long time. + +Task-number: PYSIDE-2221 +Change-Id: Idc16063953ba82d4053cc60a7e0ef11b71b7b571 +Pick-to: 6.9 +Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> +--- a/testing/runner.py ++++ b/testing/runner.py +@@ -20,7 +20,7 @@ + build_scripts_dir = os.path.abspath(os.path.join(this_dir, "..")) + + sys.path.append(build_scripts_dir) +-from build_scripts.utils import detect_clang ++from build_scripts.utils import detect_clang # noqa: E402 + + + class TestRunner: +@@ -78,11 +78,12 @@ def _find_ctest_in_file(self, file_name): + Helper for _find_ctest() that finds the ctest binary in a build + system file (ninja, Makefile). + """ +- look_for = "--force-new-ctest-process" ++ # Looking for a command ending this way: ++ look_for = "\\ctest.exe" if "win32" in sys.platform else "/ctest" + line = None + with open(file_name) as makefile: + for line in makefile: +- if look_for in line: ++ if look_for in line and line.lstrip().startswith("COMMAND"): + break + else: + # We have probably forgotten to build the tests. +@@ -98,7 +99,8 @@ def _find_ctest_in_file(self, file_name): + raise RuntimeError(msg) + # the ctest program is on the left to look_for + assert line, f"Did not find {look_for}" +- ctest = re.search(r'(\S+|"([^"]+)")\s+' + look_for, line).groups() ++ look = re.escape(look_for) ++ ctest = re.search(fr'(\S+{look}|"([^"]+{look})")', line).groups() + return ctest[1] or ctest[0] + + def _find_ctest(self): diff --git a/dev-python/pyside/pyside-6.9.0.ebuild b/dev-python/pyside/pyside-6.9.1.ebuild index 6d4844edaf7b..2d2946e83181 100644 --- a/dev-python/pyside/pyside-6.9.0.ebuild +++ b/dev-python/pyside/pyside-6.9.1.ebuild @@ -223,6 +223,7 @@ BDEPEND=" PATCHES=( # Needs porting to newer wheel and setuptools "${FILESDIR}/${PN}-6.8.2-quick-fix-build-wheel.patch" + "${FILESDIR}/${PN}-6.9.1-fix-tests-cmake4.patch" ) # Build system duplicates system libraries. TODO: fix |