[neon/qt/qtbase/Neon/release] debian: Backport upstream patch to fix qtconcurrentthreadengine.h with GCC 11

[Andrea Pappacoda]

Git commit 2a316b55fd45985ac19e23806792d5a872bf7951 by Andrea Pappacoda.
Committed on 01/04/2022 at 23:03.
Pushed by jriddell into branch 'Neon/release'.

Backport upstream patch to fix qtconcurrentthreadengine.h with GCC 11

Closes: #1008391

M  +8    -0    debian/changelog
A  +37   -0    debian/patches/gcc-11-qtconcurrentthreadengine.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/2a316b55fd45985ac19e23806792d5a872bf7951

diff --git a/debian/changelog b/debian/changelog
index 992f6f2..e9ec1c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtbase-opensource-src (5.15.3+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Andrea Pappacoda ]
+  * Backport upstream patch to fix qtconcurrentthreadengine.h with GCC 11.
+    - Closes: #1008391
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Apr 2022 00:58:27 +0200
+
 qtbase-opensource-src (5.15.3+dfsg-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/gcc-11-qtconcurrentthreadengine.diff b/debian/patches/gcc-11-qtconcurrentthreadengine.diff
new file mode 100644
index 0000000..fe58c13
--- /dev/null
+++ b/debian/patches/gcc-11-qtconcurrentthreadengine.diff
@@ -0,0 +1,37 @@
+Description: Fix builds of qtconcurrentthreadengine.h with GCC 11
+ Without this patch, all the code that #includes QtConcurrent headers
+ will fail to compile with GCC 11.
+Origin: upstream, https://codereview.qt-project.org/c/qt/qtbase/+/339417
+Last-Update: 2022-04-01
+
+From 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3 Mon Sep 17 00:00:00 2001
+From: Sona Kurazyan <sona.kurazyan at qt.io>
+Date: Wed, 17 Mar 2021 16:04:00 +0100
+Subject: [PATCH] Remove the unnecessary template parameter from the class specialization
+
+This seems to cause errors when compiling with gcc-11. Although this is
+most likely a compiler bug, specifiying the template parameter type in
+this case isn't necessary.
+
+Fixes: QTBUG-91909
+Fixes: QTBUG-90568
+Pick-to: 6.0 6.1 5.15
+Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
+Reviewed-by: Mårten Nordheim <marten.nordheim at qt.io>
+---
+
+diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
+index cbd8ad04..4cd5b85 100644
+--- a/src/concurrent/qtconcurrentthreadengine.h
++++ b/src/concurrent/qtconcurrentthreadengine.h
+@@ -256,8 +256,8 @@
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
+ {
+ public:
+-    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
+-    :ThreadEngineStarterBase<void>(_threadEngine) {}
++    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
++        : ThreadEngineStarterBase<void>(_threadEngine) {}
+ 
+     void startBlocking()
+     {
diff --git a/debian/patches/series b/debian/patches/series
index 664eef9..8a0a3a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,7 @@ mysql_field_readonly.diff
 CVE-2021-38593.diff
 openssl3.diff
 CVE-2022-25255.diff
+gcc-11-qtconcurrentthreadengine.diff
 
 # Debian specific.
 gnukfreebsd.diff