From a1de0b60006d5d4ebf88d3bda35543c178fc1552 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 7 May 2019 23:57:51 +0300 Subject: [PATCH] LibreOffice: bump version --- ....3.2.recipe => libreoffice-6.2.4.1.recipe} | 2 +- ....patchset => libreoffice-6.2.4.1.patchset} | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) rename app-office/libreoffice/{libreoffice-6.2.3.2.recipe => libreoffice-6.2.4.1.recipe} (99%) rename app-office/libreoffice/patches/{libreoffice-6.2.3.2.patchset => libreoffice-6.2.4.1.patchset} (88%) diff --git a/app-office/libreoffice/libreoffice-6.2.3.2.recipe b/app-office/libreoffice/libreoffice-6.2.4.1.recipe similarity index 99% rename from app-office/libreoffice/libreoffice-6.2.3.2.recipe rename to app-office/libreoffice/libreoffice-6.2.4.1.recipe index 1f4412c33..0e6907daa 100644 --- a/app-office/libreoffice/libreoffice-6.2.3.2.recipe +++ b/app-office/libreoffice/libreoffice-6.2.4.1.recipe @@ -21,7 +21,7 @@ REVISION="1" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" -CHECKSUM_SHA256="557319089651218ac03a86ef15e27fc58d758989195681698af619c48f17c4f2" +CHECKSUM_SHA256="7c6ec58d0b35f0791aa6771a98e9e45bbb8abed0a782fbbe0e3dea0ffc44266b" #SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" #CHECKSUM_SHA256_2="4e7d6943c1ab8350cf9300825c69d95592d3b066ee78738e02581977fbde1d3f" diff --git a/app-office/libreoffice/patches/libreoffice-6.2.3.2.patchset b/app-office/libreoffice/patches/libreoffice-6.2.4.1.patchset similarity index 88% rename from app-office/libreoffice/patches/libreoffice-6.2.3.2.patchset rename to app-office/libreoffice/patches/libreoffice-6.2.4.1.patchset index ad81fadd2..7e4d8aeb7 100644 --- a/app-office/libreoffice/patches/libreoffice-6.2.3.2.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.2.4.1.patchset @@ -175,30 +175,6 @@ index 4410398..299b90e 100644 2.19.1 -From 6cae77f892d1cfc6f3ad84e80022a1e371d9721e Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Tue, 6 Nov 2018 15:09:16 +0300 -Subject: Workaround a bug in Haiku Qt5 QPA module - -Calling winId() causes QPA to triple windows - -diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx -index ad043eb..bdd9571 100644 ---- a/vcl/qt5/Qt5Frame.cxx -+++ b/vcl/qt5/Qt5Frame.cxx -@@ -140,7 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) - } - - m_aSystemData.nSize = sizeof(SystemEnvData); -- m_aSystemData.aWindow = m_pQWidget->winId(); -+ //m_aSystemData.aWindow = m_pQWidget->winId(); - m_aSystemData.aShellWindow = reinterpret_cast(this); - //m_aSystemData.pSalFrame = this; - //m_aSystemData.pWidget = m_pQWidget; --- -2.19.1 - - From e652ba226a618b1052140f5a0fd8ac658ee6d573 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 21 Nov 2018 13:39:14 +0300