Attachment 225389 Details for Bug 256276 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug256276.diff (text/plain), 2.10 KB, created by Jan Beich on 2021-05-31 01:36:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-05-31 01:36:27 UTC

Size: 2.10 KB

patch

obsolete

>From 46c6cee6d118bc314b8c95ef66c39a71523c491a Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 31 May 2021 01:19:50 +0000
>Subject: [PATCH] devel/qt5-concurrent: unbreak with gcc11 via upstream
>
>/usr/local/include/qt5/QtConcurrent/qtconcurrentthreadengine.h:250:50: error: invalid declarator before '*' token
>  250 |     ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
>      |                                                  ^
>/usr/local/include/qt5/QtConcurrent/qtconcurrentthreadengine.h:250:49: error: expected ')' before '*' token
>  250 |     ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
>      |                              ~                  ^~
>      |                                                 )
>
>PR:		256276
>Approved by:	?
>---
> devel/qt5-concurrent/Makefile          |  2 +-
> devel/qt5-concurrent/files/patch-gcc11 | 15 +++++++++++++++
> 2 files changed, 16 insertions(+), 1 deletion(-)
> create mode 100644 devel/qt5-concurrent/files/patch-gcc11
>
>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()
>+     {

Actions: View | Diff

Attachments on bug 256276: 225389