From 24a50bbea30870692afbda0803ebfe6786280096 Mon Sep 17 00:00:00 2001 From: Stuart Prescott Date: Tue, 10 Feb 2026 17:19:53 +1100 Subject: [PATCH] Rebase patches to new upstream --- ...x-missing-subparser-in-test-harness.patch} | 4 ++-- .../patches/0002-disable-qtexampleicons.patch | 18 --------------- ...0003-Add-failing-tests-to-blacklist.patch} | 4 ++-- ... => 0004-Fix-numpy-header-detection.patch} | 2 +- ...-test-failures-as-xfail-temporarily.patch} | 4 ++-- ...XFAIL-a-new-test-failure-with-6.7.2.patch} | 4 ++-- ...h => 0007-XFAIL-smart-smart_pointer.patch} | 2 +- ...-XFAIL-QtQml-qquickitem_grabToImage.patch} | 4 ++-- ...09-Fix-python-module-paths-in-CMake.patch} | 4 ++-- ...-dependency-from-shiboken6_generator.patch | 22 +++++++++++++++++++ debian/patches/series | 18 +++++++-------- 11 files changed, 45 insertions(+), 41 deletions(-) rename debian/patches/{0003-Fix-missing-subparser-in-test-harness.patch => 0002-Fix-missing-subparser-in-test-harness.patch} (90%) delete mode 100644 debian/patches/0002-disable-qtexampleicons.patch rename debian/patches/{0004-Add-failing-tests-to-blacklist.patch => 0003-Add-failing-tests-to-blacklist.patch} (95%) rename debian/patches/{0005-Fix-numpy-header-detection.patch => 0004-Fix-numpy-header-detection.patch} (97%) rename debian/patches/{0006-Mark-arm64-test-failures-as-xfail-temporarily.patch => 0005-Mark-arm64-test-failures-as-xfail-temporarily.patch} (92%) rename debian/patches/{0007-XFAIL-a-new-test-failure-with-6.7.2.patch => 0006-XFAIL-a-new-test-failure-with-6.7.2.patch} (92%) rename debian/patches/{0008-XFAIL-smart-smart_pointer.patch => 0007-XFAIL-smart-smart_pointer.patch} (94%) rename debian/patches/{0009-XFAIL-QtQml-qquickitem_grabToImage.patch => 0008-XFAIL-QtQml-qquickitem_grabToImage.patch} (91%) rename debian/patches/{0010-Fix-python-module-paths-in-CMake.patch => 0009-Fix-python-module-paths-in-CMake.patch} (92%) create mode 100644 debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch diff --git a/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch b/debian/patches/0002-Fix-missing-subparser-in-test-harness.patch similarity index 90% rename from debian/patches/0003-Fix-missing-subparser-in-test-harness.patch rename to debian/patches/0002-Fix-missing-subparser-in-test-harness.patch index 346ce735..5d2dd3bd 100644 --- a/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch +++ b/debian/patches/0002-Fix-missing-subparser-in-test-harness.patch @@ -8,10 +8,10 @@ Not needed in the build but needed for debugging the test harness... 1 file changed, 1 insertion(+) diff --git a/testing/command.py b/testing/command.py -index be4ed8a..e0b73d0 100644 +index 9ef35ee..c52b09f 100644 --- a/testing/command.py +++ b/testing/command.py -@@ -199,6 +199,7 @@ def main(): +@@ -204,6 +204,7 @@ def main(): type=int, help="use build number n (0-based), latest = -1 (default)", ) diff --git a/debian/patches/0002-disable-qtexampleicons.patch b/debian/patches/0002-disable-qtexampleicons.patch deleted file mode 100644 index 17f3c1e7..00000000 --- a/debian/patches/0002-disable-qtexampleicons.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Debian Qt/KDE Maintainers -Date: Fri, 3 May 2024 16:47:57 +1000 -Subject: disable-qtexampleicons - ---- - sources/pyside6/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt -index f45c071..fbb55a6 100644 ---- a/sources/pyside6/CMakeLists.txt -+++ b/sources/pyside6/CMakeLists.txt -@@ -42,4 +42,4 @@ endif() - - add_subdirectory(doc) - --add_subdirectory(qtexampleicons) -+# add_subdirectory(qtexampleicons) diff --git a/debian/patches/0004-Add-failing-tests-to-blacklist.patch b/debian/patches/0003-Add-failing-tests-to-blacklist.patch similarity index 95% rename from debian/patches/0004-Add-failing-tests-to-blacklist.patch rename to debian/patches/0003-Add-failing-tests-to-blacklist.patch index b88d7065..46a6e2cb 100644 --- a/debian/patches/0004-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 5f0183f..f805980 100644 +index adfb0c6..a000e22 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -91,3 +91,19 @@ +@@ -82,3 +82,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-Fix-numpy-header-detection.patch b/debian/patches/0004-Fix-numpy-header-detection.patch similarity index 97% rename from debian/patches/0005-Fix-numpy-header-detection.patch rename to debian/patches/0004-Fix-numpy-header-detection.patch index c0f5cc92..bb90270e 100644 --- a/debian/patches/0005-Fix-numpy-header-detection.patch +++ b/debian/patches/0004-Fix-numpy-header-detection.patch @@ -9,7 +9,7 @@ and fails to find the headers; numpy has an explicit function for this 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/build_scripts/utils.py b/build_scripts/utils.py -index 29f2545..d5c1063 100644 +index 3cb7ade..c37d087 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -77,17 +77,8 @@ def update_env_path(newpaths): diff --git a/debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch b/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch similarity index 92% rename from debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch rename to debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch index 4739114f..91c23c8e 100644 --- a/debian/patches/0006-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 f805980..dfee4f9 100644 +index a000e22..3adc7e9 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -107,3 +107,11 @@ +@@ -98,3 +98,11 @@ py3 [QtCharts::qcharts_numpy_test] py3 diff --git a/debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch b/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch similarity index 92% rename from debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch rename to debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch index bc6d2221..160d5332 100644 --- a/debian/patches/0007-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 dfee4f9..43fa65e 100644 +index 3adc7e9..895bca1 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -99,6 +99,8 @@ +@@ -90,6 +90,8 @@ py3 [pyside6-android-deploy::test_pyside6_android_deploy] py3 diff --git a/debian/patches/0008-XFAIL-smart-smart_pointer.patch b/debian/patches/0007-XFAIL-smart-smart_pointer.patch similarity index 94% rename from debian/patches/0008-XFAIL-smart-smart_pointer.patch rename to debian/patches/0007-XFAIL-smart-smart_pointer.patch index 0d262171..86a474f4 100644 --- a/debian/patches/0008-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 43fa65e..9219f1c 100644 +index 895bca1..52ebc12 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -1,5 +1,6 @@ diff --git a/debian/patches/0009-XFAIL-QtQml-qquickitem_grabToImage.patch b/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch similarity index 91% rename from debian/patches/0009-XFAIL-QtQml-qquickitem_grabToImage.patch rename to debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch index 6836e6cf..8718916d 100644 --- a/debian/patches/0009-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 9219f1c..b7238fb 100644 +index 52ebc12..59dbef3 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt -@@ -118,3 +118,7 @@ +@@ -109,3 +109,7 @@ py3 [pysidetest::new_inherited_functions_test] py3 diff --git a/debian/patches/0010-Fix-python-module-paths-in-CMake.patch b/debian/patches/0009-Fix-python-module-paths-in-CMake.patch similarity index 92% rename from debian/patches/0010-Fix-python-module-paths-in-CMake.patch rename to debian/patches/0009-Fix-python-module-paths-in-CMake.patch index 22a1b6d6..f718b27e 100644 --- a/debian/patches/0010-Fix-python-module-paths-in-CMake.patch +++ b/debian/patches/0009-Fix-python-module-paths-in-CMake.patch @@ -7,10 +7,10 @@ Subject: Fix python module paths in CMake 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake -index 9c47770..fa61aed 100644 +index 0e993fa..63044c3 100644 --- a/sources/shiboken6/cmake/ShibokenHelpers.cmake +++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake -@@ -125,13 +125,13 @@ macro(shiboken_internal_set_python_site_packages) +@@ -143,13 +143,13 @@ macro(shiboken_internal_set_python_site_packages) if sys.platform == 'win32': lib_path = sysconfig.get_path('purelib') else: diff --git a/debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch b/debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch new file mode 100644 index 00000000..5e0f8d5a --- /dev/null +++ b/debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch @@ -0,0 +1,22 @@ +From: Stuart Prescott +Date: Wed, 19 Feb 2025 00:32:42 +1100 +Subject: Remove dependency from shiboken6_generator + +Breaks dh_python3 dependency calculation +--- + create_wheels.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/create_wheels.py b/create_wheels.py +index 6f8d881..d68b4cd 100644 +--- a/create_wheels.py ++++ b/create_wheels.py +@@ -186,7 +186,7 @@ def generate_pyproject_toml(artifacts: Path, setup: SetupData) -> str: + _dependencies.append(f"shiboken6=={setup.version[0]}") + _dependencies.append(f"PySide6_Essentials=={setup.version[0]}") + elif _name == "shiboken6_generator": +- _dependencies.append(f"shiboken6=={setup.version[0]}") ++ pass + + with open(artifacts / "pyproject.toml.base") as f: + content = ( diff --git a/debian/patches/series b/debian/patches/series index f2aea2b5..206b353f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,10 @@ 0001-test-with-current-interpreter.patch -0002-disable-qtexampleicons.patch -0003-Fix-missing-subparser-in-test-harness.patch -0004-Add-failing-tests-to-blacklist.patch -0005-Fix-numpy-header-detection.patch -0006-Mark-arm64-test-failures-as-xfail-temporarily.patch -0007-XFAIL-a-new-test-failure-with-6.7.2.patch -0008-XFAIL-smart-smart_pointer.patch -0009-XFAIL-QtQml-qquickitem_grabToImage.patch -0010-Fix-python-module-paths-in-CMake.patch +0002-Fix-missing-subparser-in-test-harness.patch +0003-Add-failing-tests-to-blacklist.patch +0004-Fix-numpy-header-detection.patch +0005-Mark-arm64-test-failures-as-xfail-temporarily.patch +0006-XFAIL-a-new-test-failure-with-6.7.2.patch +0007-XFAIL-smart-smart_pointer.patch +0008-XFAIL-QtQml-qquickitem_grabToImage.patch +0009-Fix-python-module-paths-in-CMake.patch +0010-Remove-dependency-from-shiboken6_generator.patch -- 2.30.2