svn commit: r565508 - in branches/2021Q1/editors/libreoffice: . files

[Dima Panov]

Author: fluffy
Date: Wed Feb 17 15:10:10 2021
New Revision: 565508
URL: https://svnweb.freebsd.org/changeset/ports/565508

Log:
  MFH: r565507
  
  editors/libreoffice: resurrect deleted by mistake patch for qt5-cairo engine to fix CJK fonts rendering in menus and dialogs
  
  PR:		253371, 253579
  Pointy hat to:	fluffy

Added:
  branches/2021Q1/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
     - copied unchanged from r565507, head/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
Modified:
  branches/2021Q1/editors/libreoffice/Makefile
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/editors/libreoffice/Makefile
==============================================================================
--- branches/2021Q1/editors/libreoffice/Makefile	Wed Feb 17 15:06:12 2021	(r565507)
+++ branches/2021Q1/editors/libreoffice/Makefile	Wed Feb 17 15:10:10 2021	(r565508)
@@ -1,5 +1,5 @@
 # $FreeBSD$
-PORTREVISION=	0
+PORTREVISION=	1
 
 .include "${.CURDIR}/Makefile.common"
 

Copied: branches/2021Q1/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx (from r565507, head/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2021Q1/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx	Wed Feb 17 15:10:10 2021	(r565508, copy of r565507, head/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx)
@@ -0,0 +1,35 @@
+--- vcl/qt5/Qt5Instance.cxx.orig	2020-05-13 11:19:20 UTC
++++ vcl/qt5/Qt5Instance.cxx
+@@ -261,7 +261,13 @@ SalFrame* Qt5Instance::CreateChildFrame(SystemParentDa
+ SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
+ {
+     assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
+-    return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo);
++    SalFrame* pRet(nullptr);
++    bool bUseCairo = m_bUseCairo;
++    RunInMainThread([&pRet, pParent, nStyle, bUseCairo]() {
++        pRet = new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, bUseCairo);
++    });
++    assert(pRet);
++    return pRet;
+ }
+ 
+ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
+@@ -420,7 +426,7 @@ Qt5Instance::createPicker(css::uno::Reference<css::uno
+     {
+         SolarMutexGuard g;
+         Qt5FilePicker* pPicker;
+-        RunInMainThread([&, this]() { pPicker = createPicker(context, eMode); });
++        RunInMainThread([&pPicker, this, context, eMode]() { pPicker = createPicker(context, eMode); });
+         assert(pPicker);
+         return pPicker;
+     }
+@@ -624,7 +630,7 @@ std::unique_ptr<QApplication> Qt5Instance::CreateQAppl
+ extern "C" {
+ VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
+ {
+-    static const bool bUseCairo = (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
++    static const bool bUseCairo = true; // (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
+ 
+     std::unique_ptr<char* []> pFakeArgv;
+     std::unique_ptr<int> pFakeArgc;