From: Stuart Prescott Date: Tue, 7 Apr 2026 05:02:46 +0000 (+1000) Subject: Refresh patches X-Git-Tag: archive/raspbian/6.10.3-2+rpi1^2~17 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3032be5709ae74e1c8f7c801b83cfaff9fdfeda5;p=pyside6.git Refresh patches --- diff --git a/debian/patches/0001-Find-the-build-directory-matching-the-current-interp.patch b/debian/patches/0001-Find-the-build-directory-matching-the-current-interp.patch new file mode 100644 index 00000000..e32857b4 --- /dev/null +++ b/debian/patches/0001-Find-the-build-directory-matching-the-current-interp.patch @@ -0,0 +1,27 @@ +From: Dmitry Shachnev +Date: Sun, 14 Nov 2021 21:08:50 +0300 +Subject: Find the build directory matching the current interpreter + +This is needed to allow us to run tests with all supported Python versions. +Without this patch, the latest build directory will be always picked, no +matter what the current interpreter is. +--- + testing/buildlog.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/testing/buildlog.py b/testing/buildlog.py +index 90ff436..034f103 100644 +--- a/testing/buildlog.py ++++ b/testing/buildlog.py +@@ -63,6 +63,11 @@ class BuildLog: + ) + sys.exit(1) + ++ # We need to find the build directory for the current interpreter ++ py_version = "{}.{}".format(sys.version_info[0], sys.version_info[1]) ++ if py_version not in build_classifiers: ++ continue ++ + if not os.path.exists(build_dir): + rel_dir, low_part = os.path.split(build_dir) + rel_dir, two_part = os.path.split(rel_dir) diff --git a/debian/patches/0001-test-with-current-interpreter.patch b/debian/patches/0001-test-with-current-interpreter.patch deleted file mode 100644 index e32857b4..00000000 --- a/debian/patches/0001-test-with-current-interpreter.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Dmitry Shachnev -Date: Sun, 14 Nov 2021 21:08:50 +0300 -Subject: Find the build directory matching the current interpreter - -This is needed to allow us to run tests with all supported Python versions. -Without this patch, the latest build directory will be always picked, no -matter what the current interpreter is. ---- - testing/buildlog.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/testing/buildlog.py b/testing/buildlog.py -index 90ff436..034f103 100644 ---- a/testing/buildlog.py -+++ b/testing/buildlog.py -@@ -63,6 +63,11 @@ class BuildLog: - ) - sys.exit(1) - -+ # We need to find the build directory for the current interpreter -+ py_version = "{}.{}".format(sys.version_info[0], sys.version_info[1]) -+ if py_version not in build_classifiers: -+ continue -+ - if not os.path.exists(build_dir): - rel_dir, low_part = os.path.split(build_dir) - rel_dir, two_part = os.path.split(rel_dir) diff --git a/debian/patches/0003-Add-failing-tests-to-blacklist.patch b/debian/patches/0003-Add-failing-tests-to-blacklist.patch index 46a6e2cb..b5d06c81 100644 --- a/debian/patches/0003-Add-failing-tests-to-blacklist.patch +++ b/debian/patches/0003-Add-failing-tests-to-blacklist.patch @@ -11,10 +11,10 @@ It is not yet clear whether these failures are important. 1 file changed, 16 insertions(+) diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index adfb0c6..a000e22 100644 +index b2aaecb..f7e415d 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -82,3 +82,19 @@ +@@ -81,3 +81,19 @@ [QtQml::qqmlincubator_incubateWhile] pypy # gives timeout on macOS if I run video converter while testing # 2022-03-04 PyPy: Currently 28 of 657 tests fail diff --git a/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch b/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch index 91c23c8e..07894606 100644 --- a/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch +++ b/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch @@ -8,10 +8,10 @@ Try to at least get a package built to be able to debug the failure 1 file changed, 8 insertions(+) diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index a000e22..3adc7e9 100644 +index f7e415d..8cdefe9 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -98,3 +98,11 @@ +@@ -97,3 +97,11 @@ py3 [QtCharts::qcharts_numpy_test] py3 diff --git a/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch b/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch index 160d5332..4949f034 100644 --- a/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch +++ b/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch @@ -9,10 +9,10 @@ being found in multi-arch paths 1 file changed, 2 insertions(+) diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index 3adc7e9..895bca1 100644 +index 8cdefe9..d977d44 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -90,6 +90,8 @@ +@@ -89,6 +89,8 @@ py3 [pyside6-android-deploy::test_pyside6_android_deploy] py3 diff --git a/debian/patches/0007-XFAIL-smart-smart_pointer.patch b/debian/patches/0007-XFAIL-smart-smart_pointer.patch index 86a474f4..08371a65 100644 --- a/debian/patches/0007-XFAIL-smart-smart_pointer.patch +++ b/debian/patches/0007-XFAIL-smart-smart_pointer.patch @@ -8,7 +8,7 @@ Failure seen on armel 1 file changed, 1 insertion(+) diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index 895bca1..52ebc12 100644 +index d977d44..27063f9 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -1,5 +1,6 @@ diff --git a/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch b/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch index 8718916d..723b5428 100644 --- a/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch +++ b/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch @@ -8,10 +8,10 @@ Failure seen on mips64el 1 file changed, 4 insertions(+) diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index 52ebc12..59dbef3 100644 +index 27063f9..065793d 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -109,3 +109,7 @@ +@@ -108,3 +108,7 @@ py3 [pysidetest::new_inherited_functions_test] py3 diff --git a/debian/patches/series b/debian/patches/series index 70eebd47..f84c27d2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -0001-test-with-current-interpreter.patch +0001-Find-the-build-directory-matching-the-current-interp.patch 0002-Fix-missing-subparser-in-test-harness.patch 0003-Add-failing-tests-to-blacklist.patch 0004-Fix-numpy-header-detection.patch