[neon/extras/clazy/Neon/release] debian: fix two test cases

[Pino Toscano]

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

fix two test cases

backport upstream commit 04d38721ba951a9cafd276d584880d3f72c7794a

M  +3    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +56   -0    debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch

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

diff --git a/debian/changelog b/debian/changelog
index 2765391..4dad4fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ 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.
 
  -- 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 6c48ffb..d72e1d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
 debian-tests-link-atomic.diff
 select-clangpp.diff
diff --git a/debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch b/debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
new file mode 100644
index 0000000..3f1f538
--- /dev/null
+++ b/debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
@@ -0,0 +1,56 @@
+From 04d38721ba951a9cafd276d584880d3f72c7794a Mon Sep 17 00:00:00 2001
+From: Sergio Martins <smartins at kde.org>
+Date: Mon, 23 Nov 2020 16:05:40 +0000
+Subject: [PATCH] qt6-deprecated-api-fixes: Remove unrelated warnings from the
+ test
+
+There was a stray/unrelated compiler warning in the expected dataset.
+Can make the test fail if some other compiler is used and gives a different
+message
+
+CCBUG: 429552
+---
+ tests/qt6-deprecated-api-fixes/main.cpp                | 2 +-
+ tests/qt6-deprecated-api-fixes/main.cpp.expected       | 1 -
+ tests/qt6-deprecated-api-fixes/main.cpp.fixed.expected | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tests/qt6-deprecated-api-fixes/main.cpp b/tests/qt6-deprecated-api-fixes/main.cpp
+index f901b7e..37d10b3 100644
+--- a/tests/qt6-deprecated-api-fixes/main.cpp
++++ b/tests/qt6-deprecated-api-fixes/main.cpp
+@@ -164,7 +164,7 @@ void test()
+ }
+ 
+ void function1(QLinkedList<QString> arg) {};
+-QLinkedList<QString> function2() {};
++QLinkedList<QString> function2() { return {}; };
+ 
+ class aclass
+ {
+diff --git a/tests/qt6-deprecated-api-fixes/main.cpp.expected b/tests/qt6-deprecated-api-fixes/main.cpp.expected
+index 2ffd1da..23a0456 100644
+--- a/tests/qt6-deprecated-api-fixes/main.cpp.expected
++++ b/tests/qt6-deprecated-api-fixes/main.cpp.expected
+@@ -1,5 +1,4 @@
+ qt6-deprecated-api-fixes/main.cpp:38:22: warning: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings]
+-qt6-deprecated-api-fixes/main.cpp:167:35: warning: non-void function does not return a value [-Wreturn-type]
+ qt6-deprecated-api-fixes/main.cpp:29:9: warning:  function setPath() has to be used in Qt6 [-Wclazy-qt6-deprecated-api-fixes]
+ qt6-deprecated-api-fixes/main.cpp:32:10: warning:  function setPath() has to be used in Qt6 [-Wclazy-qt6-deprecated-api-fixes]
+ qt6-deprecated-api-fixes/main.cpp:35:10: warning:  function setPath() has to be used in Qt6 [-Wclazy-qt6-deprecated-api-fixes]
+diff --git a/tests/qt6-deprecated-api-fixes/main.cpp.fixed.expected b/tests/qt6-deprecated-api-fixes/main.cpp.fixed.expected
+index e26dc85..778508a 100644
+--- a/tests/qt6-deprecated-api-fixes/main.cpp.fixed.expected
++++ b/tests/qt6-deprecated-api-fixes/main.cpp.fixed.expected
+@@ -164,7 +164,7 @@ void test()
+ }
+ 
+ void function1(QLinkedList<QString> arg) {};
+-QLinkedList<QString> function2() {};
++QLinkedList<QString> function2() { return {}; };
+ 
+ class aclass
+ {
+-- 
+2.29.2
+