From owner-svn-ports-head@freebsd.org Thu Aug 22 06:21:33 2019 Return-Path: Delivered-To: svn-ports-head@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 23F18DEC3F; Thu, 22 Aug 2019 06:21:33 +0000 (UTC) (envelope-from lwhsu@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46DZDY0C7pz45N4; Thu, 22 Aug 2019 06:21:33 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCE7927D81; Thu, 22 Aug 2019 06:21:32 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7M6LWLL091223; Thu, 22 Aug 2019 06:21:32 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7M6LWpR091221; Thu, 22 Aug 2019 06:21:32 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201908220621.x7M6LWpR091221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 22 Aug 2019 06:21:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509581 - head/editors/libreoffice/files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/editors/libreoffice/files X-SVN-Commit-Revision: 509581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2019 06:21:33 -0000 Author: lwhsu Date: Thu Aug 22 06:21:32 2019 New Revision: 509581 URL: https://svnweb.freebsd.org/changeset/ports/509581 Log: Workaround for build failure due to newer C++ features when KDE5 and QT5 defined PR: 239988 Submitted by: VVD Reported by: O. Hartmann Added: head/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx (contents, props changed) head/editors/libreoffice/files/patch-vcl_unx_kde5_kde5salinstance.cxx (contents, props changed) Added: head/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx Thu Aug 22 06:21:32 2019 (r509581) @@ -0,0 +1,11 @@ +--- vcl/qt5/Qt5Instance.cxx.orig 2019-08-21 22:22:13.996160000 +0800 ++++ vcl/qt5/Qt5Instance.cxx 2019-08-21 22:30:33.169056000 +0800 +@@ -413,7 +413,7 @@ + { + SolarMutexGuard g; + Qt5FilePicker* pPicker; +- RunInMainThread(std::function([&, this]() { pPicker = createPicker(context, eMode); })); ++ RunInMainThread([&, this]() { pPicker = createPicker(context, eMode); }); + assert(pPicker); + return pPicker; + } Added: head/editors/libreoffice/files/patch-vcl_unx_kde5_kde5salinstance.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-vcl_unx_kde5_kde5salinstance.cxx Thu Aug 22 06:21:32 2019 (r509581) @@ -0,0 +1,23 @@ +--- vcl/unx/kde5/KDE5SalInstance.cxx.orig ++++ vcl/unx/kde5/KDE5SalInstance.cxx +@@ -43,9 +43,9 @@ + SalFrame* KDE5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nState) + { + SalFrame* pRet(nullptr); +- RunInMainThread(std::function([&pRet, pParent, nState]() { ++ RunInMainThread([&pRet, pParent, nState]() { + pRet = new KDE5SalFrame(static_cast(pParent), nState, true); +- })); ++ }); + assert(pRet); + return pRet; + } +@@ -65,7 +65,7 @@ + { + SolarMutexGuard g; + Qt5FilePicker* pPicker; +- RunInMainThread(std::function([&, this]() { pPicker = createPicker(context, eMode); })); ++ RunInMainThread([&, this]() { pPicker = createPicker(context, eMode); }); + assert(pPicker); + return pPicker; + }