[neon/extras/clazy/Neon/release] debian: backport one more fix

[Pino Toscano]

Git commit e966e09162be2d81f178f239765ac5559e7c2cb2 by Pino Toscano.
Committed on 23/11/2020 at 16:42.
Pushed by jriddell into branch 'Neon/release'.

backport one more fix

upstream commit c1dc65494574227646e1dd36675a5bd906660647

M  +4    -3    debian/changelog
M  +1    -0    debian/patches/series
A  +32   -0    debian/patches/upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch

https://invent.kde.org/neon/extras/clazy/commit/e966e09162be2d81f178f239765ac5559e7c2cb2

diff --git a/debian/changelog b/debian/changelog
index 4dad4fa..c6d7c31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,10 @@ clazy (1.8-0r1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.5.1, no changes required.
   * Update the build dependencies according to the upstream build system:
     - bump clang & LLVM to 7.0
-  * Backport upstream commit 04d38721ba951a9cafd276d584880d3f72c7794a to fix
-    two test cases; patch
-    upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch.
+  * Backport upstream commit 04d38721ba951a9cafd276d584880d3f72c7794a, and
+    commit c1dc65494574227646e1dd36675a5bd906660647 to fix two test cases;
+    patches upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
+    and upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 23 Nov 2020 14:25:32 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index d72e1d8..e7301f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
+upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch
 debian-tests-link-atomic.diff
 select-clangpp.diff
diff --git a/debian/patches/upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch b/debian/patches/upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch
new file mode 100644
index 0000000..1ab8099
--- /dev/null
+++ b/debian/patches/upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch
@@ -0,0 +1,32 @@
+From c1dc65494574227646e1dd36675a5bd906660647 Mon Sep 17 00:00:00 2001
+From: Sergio Martins <smartins at kde.org>
+Date: Mon, 23 Nov 2020 16:30:27 +0000
+Subject: [PATCH] qt6-qlatin1stringchar-to-u: Only run tests with clang 11
+
+It's flaky with other versions.
+Not disabling the check since it still works, just warns twice for
+the same line.
+
+CCMAIL: lucie.gerard at qt.io
+BUG: 429552
+---
+ tests/qt6-qlatin1stringchar-to-u/config.json | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qt6-qlatin1stringchar-to-u/config.json b/tests/qt6-qlatin1stringchar-to-u/config.json
+index 7867efa..efe4894 100644
+--- a/tests/qt6-qlatin1stringchar-to-u/config.json
++++ b/tests/qt6-qlatin1stringchar-to-u/config.json
+@@ -4,7 +4,8 @@
+             "filename" : "main.cpp",
+             "qt_major_version": 5,
+             "minimum_qt_version" : 50000,
+-            "has_fixits" : true
++            "has_fixits" : true,
++            "minimum_clang_version" : 1100
+         }
+     ]
+ }
+-- 
+2.29.2
+