[neon/extras/clazy/Neon/release] debian: update the patches

[Pino Toscano]

Git commit 75f479a8bf87b330fb71dea2c7680ca50f3a845c by Pino Toscano.
Committed on 10/01/2021 at 23:10.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch:
  drop, backported from upstream
- upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch:
  drop, backported from upstream

M  +5    -0    debian/changelog
M  +0    -2    debian/patches/series
D  +0    -56   debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
D  +0    -32   debian/patches/upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch

https://invent.kde.org/neon/extras/clazy/commit/75f479a8bf87b330fb71dea2c7680ca50f3a845c

diff --git a/debian/changelog b/debian/changelog
index ebda439..fae72dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ clazy (1.9-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch:
+      drop, backported from upstream
+    - upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch:
+      drop, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 11 Jan 2021 00:07:46 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index e7301f2..6c48ffb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-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-deprecated-api-fixes-Remove-unrelated-warnings-f.patch b/debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
deleted file mode 100644
index 3f1f538..0000000
--- a/debian/patches/upstream_qt6-deprecated-api-fixes-Remove-unrelated-warnings-f.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
-
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
deleted file mode 100644
index 1ab8099..0000000
--- a/debian/patches/upstream_qt6-qlatin1stringchar-to-u-Only-run-tests-with-clang.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-