[neon/qt6/pyside6/Neon/release] debian/patches: refresh patches

Tue Oct 29 08:52:25 GMT 2024

Git commit 339bd1ddec578f98d7797c440f339d4dedefb398 by Carlos De Maine.
Committed on 29/10/2024 at 08:48.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +1    -3    debian/patches/0001-test-with-current-interpreter.patch
M  +1    -3    debian/patches/0002-disable-qtexampleicons.patch
M  +1    -3    debian/patches/0003-Fix-missing-subparser-in-test-harness.patch
M  +0    -2    debian/patches/0004-Add-failing-tests-to-blacklist.patch
M  +7    -4    debian/patches/0005-Fix-numpy-header-detection.patch
M  +0    -2    debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch
M  +0    -2    debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch
M  +0    -2    debian/patches/0008-XFAIL-smart-smart_pointer.patch
M  +0    -2    debian/patches/0009-XFAIL-QtQml-qquickitem_grabToImage.patch

https://invent.kde.org/neon/qt6/pyside6/-/commit/339bd1ddec578f98d7797c440f339d4dedefb398

diff --git a/debian/patches/0001-test-with-current-interpreter.patch b/debian/patches/0001-test-with-current-interpreter.patch
index 3509bbd9..00345850 100644
--- a/debian/patches/0001-test-with-current-interpreter.patch
+++ b/debian/patches/0001-test-with-current-interpreter.patch
@@ -9,11 +9,9 @@ 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 f82191f..38538dd 100644
 --- a/testing/buildlog.py
 +++ b/testing/buildlog.py
-@@ -62,6 +62,11 @@ class BuildLog(object):
+@@ -63,6 +63,11 @@
                      )
                      sys.exit(1)
  
diff --git a/debian/patches/0002-disable-qtexampleicons.patch b/debian/patches/0002-disable-qtexampleicons.patch
index 17f3c1e7..f3e96595 100644
--- a/debian/patches/0002-disable-qtexampleicons.patch
+++ b/debian/patches/0002-disable-qtexampleicons.patch
@@ -6,11 +6,9 @@ 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()
+@@ -42,4 +42,4 @@
  
  add_subdirectory(doc)
  
diff --git a/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch b/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch
index 02a6497d..56e1155d 100644
--- a/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch
+++ b/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch
@@ -7,11 +7,9 @@ Not needed in the build but needed for debugging the test harness...
  testing/command.py | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/testing/command.py b/testing/command.py
-index 31a48f8..859ebf1 100644
 --- a/testing/command.py
 +++ b/testing/command.py
-@@ -194,6 +194,7 @@ def main():
+@@ -195,6 +195,7 @@
          type=int,
          help="use build number n (0-based), latest = -1 (default)",
      )
diff --git a/debian/patches/0004-Add-failing-tests-to-blacklist.patch b/debian/patches/0004-Add-failing-tests-to-blacklist.patch
index b88d7065..20b71ce2 100644
--- a/debian/patches/0004-Add-failing-tests-to-blacklist.patch
+++ b/debian/patches/0004-Add-failing-tests-to-blacklist.patch
@@ -10,8 +10,6 @@ It is not yet clear whether these failures are important.
  build_history/blacklist.txt | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
-diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
-index 5f0183f..f805980 100644
 --- a/build_history/blacklist.txt
 +++ b/build_history/blacklist.txt
 @@ -91,3 +91,19 @@
diff --git a/debian/patches/0005-Fix-numpy-header-detection.patch b/debian/patches/0005-Fix-numpy-header-detection.patch
index fdfbecab..d6c70693 100644
--- a/debian/patches/0005-Fix-numpy-header-detection.patch
+++ b/debian/patches/0005-Fix-numpy-header-detection.patch
@@ -8,11 +8,9 @@ and fails to find the headers; numpy has an explicit function for this
  build_scripts/utils.py | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
-diff --git a/build_scripts/utils.py b/build_scripts/utils.py
-index 74d9e6f..8121c8d 100644
 --- a/build_scripts/utils.py
 +++ b/build_scripts/utils.py
-@@ -67,12 +67,8 @@ def update_env_path(newpaths):
+@@ -68,17 +68,8 @@
  
  
  def get_numpy_location():
@@ -20,7 +18,12 @@ index 74d9e6f..8121c8d 100644
 -        if 'site-' in p:
 -            numpy = Path(p).resolve() / 'numpy'
 -            if numpy.is_dir():
--                return os.fspath(numpy / 'core' / 'include')
+-                candidate = numpy / '_core' / 'include'  # Version 2
+-                if not candidate.is_dir():
+-                    candidate = numpy / 'core' / 'include'  # Version 1
+-                if candidate.is_dir():
+-                    return os.fspath(candidate)
+-                log.warning(f"Cannot find numpy include dir under {numpy}")
 -    return None
 +    import numpy
 +    return numpy.get_include()
diff --git a/debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch b/debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch
index 4739114f..b4a36b8c 100644
--- a/debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch
+++ b/debian/patches/0006-Mark-arm64-test-failures-as-xfail-temporarily.patch
@@ -7,8 +7,6 @@ Try to at least get a package built to be able to debug the failure
  build_history/blacklist.txt | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
-index f805980..dfee4f9 100644
 --- a/build_history/blacklist.txt
 +++ b/build_history/blacklist.txt
 @@ -107,3 +107,11 @@
diff --git a/debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch b/debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch
index bc6d2221..83aa09c5 100644
--- a/debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch
+++ b/debian/patches/0007-XFAIL-a-new-test-failure-with-6.7.2.patch
@@ -8,8 +8,6 @@ being found in multi-arch paths
  build_history/blacklist.txt | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
-index dfee4f9..43fa65e 100644
 --- a/build_history/blacklist.txt
 +++ b/build_history/blacklist.txt
 @@ -99,6 +99,8 @@
diff --git a/debian/patches/0008-XFAIL-smart-smart_pointer.patch b/debian/patches/0008-XFAIL-smart-smart_pointer.patch
index 0d262171..444463dd 100644
--- a/debian/patches/0008-XFAIL-smart-smart_pointer.patch
+++ b/debian/patches/0008-XFAIL-smart-smart_pointer.patch
@@ -7,8 +7,6 @@ Failure seen on armel
  build_history/blacklist.txt | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
-index 43fa65e..9219f1c 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/0009-XFAIL-QtQml-qquickitem_grabToImage.patch
index 6836e6cf..c14716fe 100644
--- a/debian/patches/0009-XFAIL-QtQml-qquickitem_grabToImage.patch
+++ b/debian/patches/0009-XFAIL-QtQml-qquickitem_grabToImage.patch
@@ -7,8 +7,6 @@ Failure seen on mips64el
  build_history/blacklist.txt | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
-index 9219f1c..b7238fb 100644
 --- a/build_history/blacklist.txt
 +++ b/build_history/blacklist.txt
 @@ -118,3 +118,7 @@
