From owner-dev-commits-ports-main@freebsd.org Mon Jun 28 08:43:02 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E92D652175; Mon, 28 Jun 2021 08:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GD1Mp38XGz4dH2; Mon, 28 Jun 2021 08:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 54469222F6; Mon, 28 Jun 2021 08:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15S8h2WO054407; Mon, 28 Jun 2021 08:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15S8h2VH054406; Mon, 28 Jun 2021 08:43:02 GMT (envelope-from git) Date: Mon, 28 Jun 2021 08:43:02 GMT Message-Id: <202106280843.15S8h2VH054406@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: a4a75822cf38 - main - devel/qt5-concurrent: fix build with gcc11 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4a75822cf3861bf72133544b9e048ece7914717 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2021 08:43:02 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4a75822cf3861bf72133544b9e048ece7914717 commit a4a75822cf3861bf72133544b9e048ece7914717 Author: Jan Beich AuthorDate: 2021-06-28 08:37:25 +0000 Commit: Adriaan de Groot CommitDate: 2021-06-28 08:42:46 +0000 devel/qt5-concurrent: fix build with gcc11 Build errors from misplaced template specialization: 250 | ThreadEngineStarter(ThreadEngine *_threadEngine) | ^ 250 | ThreadEngineStarter(ThreadEngine *_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 : public ThreadEngineStarterBase + { + public: +- ThreadEngineStarter(ThreadEngine *_threadEngine) +- :ThreadEngineStarterBase(_threadEngine) {} ++ ThreadEngineStarter(ThreadEngine *_threadEngine) ++ : ThreadEngineStarterBase(_threadEngine) {} + + void startBlocking() + {