[neon/qt/qbs/Neon/testing] debian: Refresh patches for the new release.

[Dmitry Shachnev]

Git commit 1965463cb8cc66ff30954c7fbe8f06026802da79 by Dmitry Shachnev.
Committed on 26/12/2020 at 10:42.
Pushed by sitter into branch 'Neon/testing'.

Refresh patches for the new release.

M  +1    -0    debian/changelog
M  +5    -3    debian/patches/no_nosys_specs.diff
M  +1    -1    debian/patches/skip_test_concurrent.diff
M  +1    -1    debian/patches/test_sanitizers_only_on_amd64.diff

https://invent.kde.org/neon/qt/qbs/commit/1965463cb8cc66ff30954c7fbe8f06026802da79

diff --git a/debian/changelog b/debian/changelog
index 0a6f73c..3591b44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.18.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Refresh patches for the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Dec 2020 13:35:38 +0300
 
diff --git a/debian/patches/no_nosys_specs.diff b/debian/patches/no_nosys_specs.diff
index 86ac7fd..9bd42a2 100644
--- a/debian/patches/no_nosys_specs.diff
+++ b/debian/patches/no_nosys_specs.diff
@@ -2,15 +2,16 @@ Description: do not use -specs=nosys.specs on Debian ARM architectures
  This requires gcc-arm-none-eabi which we do not want to depend on.
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2020-09-20
+Last-Update: 2020-12-26
 
 --- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
 +++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
-@@ -54,9 +54,7 @@ CppApplication {
+@@ -54,10 +54,7 @@ CppApplication {
      condition: {
          if (!qbs.architecture.startsWith("arm"))
              return false;
 -        return (qbs.toolchain.contains("gcc")
+-                || qbs.toolchain.contains("iar")
 -                || qbs.toolchain.contains("keil"))
 -                && !qbs.toolchain.contains("xcode")
 +        return false;
@@ -19,11 +20,12 @@ Last-Update: 2020-09-20
      cpp.cLanguageVersion: "c99"
 --- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
 +++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
-@@ -54,9 +54,7 @@ CppApplication {
+@@ -54,10 +54,7 @@ CppApplication {
      condition: {
          if (!qbs.architecture.startsWith("arm"))
              return false;
 -        return (qbs.toolchain.contains("gcc")
+-                || qbs.toolchain.contains("iar")
 -                || qbs.toolchain.contains("keil"))
 -                && !qbs.toolchain.contains("xcode")
 +        return false;
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index 778c0de..df12f2d 100644
--- a/debian/patches/skip_test_concurrent.diff
+++ b/debian/patches/skip_test_concurrent.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-03-20
 
 --- a/tests/auto/blackbox/tst_blackbox.cpp
 +++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -1671,6 +1671,7 @@ void TestBlackbox::clean()
+@@ -1729,6 +1729,7 @@ void TestBlackbox::clean()
  
  void TestBlackbox::concurrentExecutor()
  {
diff --git a/debian/patches/test_sanitizers_only_on_amd64.diff b/debian/patches/test_sanitizers_only_on_amd64.diff
index 5f3be76..3821d36 100644
--- a/debian/patches/test_sanitizers_only_on_amd64.diff
+++ b/debian/patches/test_sanitizers_only_on_amd64.diff
@@ -7,7 +7,7 @@ Last-Update: 2020-05-21
 
 --- a/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
 +++ b/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
-@@ -13,7 +13,7 @@ CppApplication {
+@@ -19,7 +19,7 @@ CppApplication {
              // thread sanitizer is not supported
              return sanitizer !== "thread";
          }