Date: Thu, 22 Aug 2019 06:21:32 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509581 - head/editors/libreoffice/files Message-ID: <201908220621.x7M6LWpR091221@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <vvd@unislabs.com> Reported by: O. Hartmann <ohartmann@walstatt.org> 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<KDE5SalFrame*>(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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908220621.x7M6LWpR091221>