[neon/qt/qtbase/Neon/release] debian/patches: Refresh patch and remove unnecessary headers.
Dmitry Shachnev
null at kde.org
Thu May 5 10:59:26 BST 2022
Git commit 68f544562288519e2b69bcf79ab12d98e203432f by Dmitry Shachnev.
Committed on 02/04/2022 at 18:08.
Pushed by jriddell into branch 'Neon/release'.
Refresh patch and remove unnecessary headers.
M +1 -19 debian/patches/gcc-11-qtconcurrentthreadengine.diff
https://invent.kde.org/neon/qt/qtbase/commit/68f544562288519e2b69bcf79ab12d98e203432f
diff --git a/debian/patches/gcc-11-qtconcurrentthreadengine.diff b/debian/patches/gcc-11-qtconcurrentthreadengine.diff
index fe58c13..8cdeb07 100644
--- a/debian/patches/gcc-11-qtconcurrentthreadengine.diff
+++ b/debian/patches/gcc-11-qtconcurrentthreadengine.diff
@@ -4,27 +4,9 @@ Description: Fix builds of qtconcurrentthreadengine.h 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 @@
+@@ -247,8 +247,8 @@ template <>
class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
{
public:
More information about the Neon-commits
mailing list