[neon/qt/qbs/Neon/release] debian/patches: Refresh patches with "--no-index -pab".

[Dmitry Shachnev]

Git commit 876aa6e04b770bbd22187dafee4ba84821bb9582 by Dmitry Shachnev.
Committed on 02/04/2022 at 13:56.
Pushed by jriddell into branch 'Neon/release'.

Refresh patches with "--no-index -pab".

M  +2    -4    debian/patches/disable_bad_assembly.diff
M  +10   -20   debian/patches/no_nosys_specs.diff
M  +4    -8    debian/patches/skip_test_concurrent.diff

https://invent.kde.org/neon/qt/qbs/commit/876aa6e04b770bbd22187dafee4ba84821bb9582

diff --git a/debian/patches/disable_bad_assembly.diff b/debian/patches/disable_bad_assembly.diff
index e5063a4..c24059b 100644
--- a/debian/patches/disable_bad_assembly.diff
+++ b/debian/patches/disable_bad_assembly.diff
@@ -5,10 +5,8 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
 Last-Update: 2020-09-20
 
-Index: qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
-===================================================================
---- qbs-src-1.21.0.orig/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
-+++ qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
+--- a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
++++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
 @@ -71,8 +71,6 @@ BareMetalApplication {
              if (qbs.architecture === "hcs8")
                  return true;
diff --git a/debian/patches/no_nosys_specs.diff b/debian/patches/no_nosys_specs.diff
index 6a2470e..c367a1e 100644
--- a/debian/patches/no_nosys_specs.diff
+++ b/debian/patches/no_nosys_specs.diff
@@ -4,10 +4,8 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
 Last-Update: 2021-01-05
 
-Index: qbs-src-1.21.0/examples/baremetal/pca10001/greenblink/greenblink.qbs
-===================================================================
---- qbs-src-1.21.0.orig/examples/baremetal/pca10001/greenblink/greenblink.qbs
-+++ qbs-src-1.21.0/examples/baremetal/pca10001/greenblink/greenblink.qbs
+--- a/examples/baremetal/pca10001/greenblink/greenblink.qbs
++++ b/examples/baremetal/pca10001/greenblink/greenblink.qbs
 @@ -52,10 +52,7 @@ CppApplication {
      condition: {
          if (!qbs.architecture.startsWith("arm"))
@@ -20,10 +18,8 @@ Index: qbs-src-1.21.0/examples/baremetal/pca10001/greenblink/greenblink.qbs
      }
      name: "pca10001-greenblink"
      cpp.cLanguageVersion: "c99"
-Index: qbs-src-1.21.0/examples/baremetal/pca10040/greenblink/greenblink.qbs
-===================================================================
---- qbs-src-1.21.0.orig/examples/baremetal/pca10040/greenblink/greenblink.qbs
-+++ qbs-src-1.21.0/examples/baremetal/pca10040/greenblink/greenblink.qbs
+--- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
++++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
 @@ -52,10 +52,7 @@ CppApplication {
      condition: {
          if (!qbs.architecture.startsWith("arm"))
@@ -36,10 +32,8 @@ Index: qbs-src-1.21.0/examples/baremetal/pca10040/greenblink/greenblink.qbs
      }
      name: "pca10040-greenblink"
      cpp.cLanguageVersion: "c99"
-Index: qbs-src-1.21.0/examples/baremetal/stm32f103/greenblink/greenblink.qbs
-===================================================================
---- qbs-src-1.21.0.orig/examples/baremetal/stm32f103/greenblink/greenblink.qbs
-+++ qbs-src-1.21.0/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+--- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
++++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
 @@ -52,10 +52,7 @@ CppApplication {
      condition: {
          if (!qbs.architecture.startsWith("arm"))
@@ -52,10 +46,8 @@ Index: qbs-src-1.21.0/examples/baremetal/stm32f103/greenblink/greenblink.qbs
      }
      name: "stm32f103-greenblink"
      cpp.cLanguageVersion: "c99"
-Index: qbs-src-1.21.0/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
-===================================================================
---- qbs-src-1.21.0.orig/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
-+++ qbs-src-1.21.0/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+--- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
++++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
 @@ -52,10 +52,7 @@ CppApplication {
      condition: {
          if (!qbs.architecture.startsWith("arm"))
@@ -68,10 +60,8 @@ Index: qbs-src-1.21.0/examples/baremetal/stm32f4discovery/blueblink/blueblink.qb
      }
      name: "stm32f4discovery-blueblink"
      cpp.cLanguageVersion: "c99"
-Index: qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
-===================================================================
---- qbs-src-1.21.0.orig/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
-+++ qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
+--- a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
++++ b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
 @@ -132,11 +132,6 @@ Product {
      }
      Properties {
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index de76e06..5cfcabf 100644
--- a/debian/patches/skip_test_concurrent.diff
+++ b/debian/patches/skip_test_concurrent.diff
@@ -3,10 +3,8 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: no
 Last-Update: 2021-01-23
 
-Index: qbs-src-1.21.0/tests/auto/blackbox/tst_blackbox.cpp
-===================================================================
---- qbs-src-1.21.0.orig/tests/auto/blackbox/tst_blackbox.cpp
-+++ qbs-src-1.21.0/tests/auto/blackbox/tst_blackbox.cpp
+--- a/tests/auto/blackbox/tst_blackbox.cpp
++++ b/tests/auto/blackbox/tst_blackbox.cpp
 @@ -1730,6 +1730,7 @@ void TestBlackbox::clean()
  
  void TestBlackbox::concurrentExecutor()
@@ -15,10 +13,8 @@ Index: qbs-src-1.21.0/tests/auto/blackbox/tst_blackbox.cpp
      QDir::setCurrent(testDataDir + "/concurrent-executor");
      QCOMPARE(runQbs(QStringList() << "-j" << "2"), 0);
      QVERIFY2(!m_qbsStderr.contains("ASSERT"), m_qbsStderr.constData());
-Index: qbs-src-1.21.0/tests/auto/blackbox/tst_blackboxjoblimits.cpp
-===================================================================
---- qbs-src-1.21.0.orig/tests/auto/blackbox/tst_blackboxjoblimits.cpp
-+++ qbs-src-1.21.0/tests/auto/blackbox/tst_blackboxjoblimits.cpp
+--- a/tests/auto/blackbox/tst_blackboxjoblimits.cpp
++++ b/tests/auto/blackbox/tst_blackboxjoblimits.cpp
 @@ -143,6 +143,7 @@ void TestBlackboxJobLimits::jobLimits_da
  
  void TestBlackboxJobLimits::jobLimits()