git: a4a75822cf38 - main - devel/qt5-concurrent: fix build with gcc11

Adriaan de Groot adridg at FreeBSD.org
Mon Jun 28 08:43:02 UTC 2021


The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a4a75822cf3861bf72133544b9e048ece7914717

commit a4a75822cf3861bf72133544b9e048ece7914717
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-06-28 08:37:25 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-06-28 08:42:46 +0000

    devel/qt5-concurrent: fix build with gcc11
    
    Build errors from misplaced template specialization:
      250 |     ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
          |                                                  ^
      250 |     ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
          |                              ~                  ^~
    
    PR:             256276
    Reported by:    jbeich
    Obtained from:  https://codereview.qt-project.org/c/qt/qtbase/+/339417
---
 devel/qt5-concurrent/Makefile          |  2 +-
 devel/qt5-concurrent/files/patch-gcc11 | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile
index a5524237682a..5cc46363ff2a 100644
--- a/devel/qt5-concurrent/Makefile
+++ b/devel/qt5-concurrent/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	concurrent
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-concurrent/files/patch-gcc11 b/devel/qt5-concurrent/files/patch-gcc11
new file mode 100644
index 000000000000..3198f6ed38ca
--- /dev/null
+++ b/devel/qt5-concurrent/files/patch-gcc11
@@ -0,0 +1,15 @@
+https://codereview.qt-project.org/c/qt/qtbase/+/339417
+
+--- src/concurrent/qtconcurrentthreadengine.h.orig	2020-10-27 08:02:11 UTC
++++ src/concurrent/qtconcurrentthreadengine.h
+@@ -247,8 +247,8 @@ template <>
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
+ {
+ public:
+-    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
+-    :ThreadEngineStarterBase<void>(_threadEngine) {}
++    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
++        : ThreadEngineStarterBase<void>(_threadEngine) {}
+ 
+     void startBlocking()
+     {


More information about the dev-commits-ports-main mailing list