diff --git a/app-office/libreoffice/libreoffice-7.1.0.3.recipe b/app-office/libreoffice/libreoffice-7.1.0.3.recipe index b1188130a..e234fef40 100644 --- a/app-office/libreoffice/libreoffice-7.1.0.3.recipe +++ b/app-office/libreoffice/libreoffice-7.1.0.3.recipe @@ -17,7 +17,7 @@ and Open Source office suite on the market: HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2021 LibreOffice contributors" LICENSE="MPL v2.0" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" diff --git a/app-office/libreoffice/patches/libreoffice-7.1.0.3.patchset b/app-office/libreoffice/patches/libreoffice-7.1.0.3.patchset index 1680e3bca..1df6bef39 100644 --- a/app-office/libreoffice/patches/libreoffice-7.1.0.3.patchset +++ b/app-office/libreoffice/patches/libreoffice-7.1.0.3.patchset @@ -1,4 +1,4 @@ -From ca456b6dbb9b86208fcb1870cec0417a94dec63c Mon Sep 17 00:00:00 2001 +From cbfe404153d3f6aafc6b70524809496eb219a7be Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 14:52:59 +0300 Subject: Make Elementary the default on Haiku @@ -22,7 +22,7 @@ index 253242b..6b55799 100644 2.30.0 -From 5f8cc2ffee4320ded43b793e937fb9a4acbf5f28 Mon Sep 17 00:00:00 2001 +From b75c6114f8bf696c8507fce763b86037983d7606 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 7 Aug 2020 12:14:40 +0300 Subject: Show used vcl backend in About window on Haiku @@ -45,7 +45,7 @@ index f91375e..7c7b20d 100644 2.30.0 -From e4af6b75c5841ee30e00433597d6df0f92d8b7f9 Mon Sep 17 00:00:00 2001 +From 1f0fd72b91f8fb4bf2522a6c9bef1f7ecda1f98e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:01:34 +0300 Subject: Identify Haiku in about window @@ -68,7 +68,7 @@ index 0093f64..3b5e402 100644 2.30.0 -From 7fb93050dc3a38523ff086c1091fb7d6b301027f Mon Sep 17 00:00:00 2001 +From e6dd932ffa51bc6339f793edf1f6ef167d3d937a Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 15:04:53 +0300 Subject: Implement ShellExec on Haiku @@ -92,7 +92,7 @@ index bbd614a..d0e97ad 100644 2.30.0 -From ba2270596c2fd7ad290dfef663f0b93982875010 Mon Sep 17 00:00:00 2001 +From ee7f873fe37d664cf50647e669d88d97b6410749 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 20 Jul 2019 01:18:50 +0300 Subject: Comment out linking with pthread @@ -119,7 +119,7 @@ index 7ef9d0b..45e28ba 100644 2.30.0 -From f955a52a008f72e757b47fdcd4cde6941a2f3b46 Mon Sep 17 00:00:00 2001 +From 40483d26575c45d8223c801369b30651736439f1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Aug 2019 11:46:49 +1000 Subject: Workaround for ambiguous methods @@ -164,7 +164,7 @@ index c9fd303..b2d15ef 100644 2.30.0 -From 992bc6c5303da1bdc20d82ae9afd2466b761f47f Mon Sep 17 00:00:00 2001 +From 2b755798bf792169b3f0a4dbb023813575fdb473 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Aug 2019 11:47:40 +1000 Subject: Add XP_HAIKU defs for xmlsec @@ -208,7 +208,7 @@ index bd2cb6a..9d6a90c 100644 2.30.0 -From 3115feb75f4b259379d90c6cf84397ef695ed8be Mon Sep 17 00:00:00 2001 +From a7fb869f41b89a14b1df2f6ec66fe7eed3321d4b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 7 Aug 2020 12:37:45 +0300 Subject: Cast to boolean @@ -299,7 +299,7 @@ index 8807927..c570173 100644 2.30.0 -From cba531491650a671ce02840f3dcc7bd8b7b6b4e2 Mon Sep 17 00:00:00 2001 +From b25ac7f1431d79e12500f2db02ea1866061f5e1e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 7 Aug 2020 12:47:56 +0300 Subject: Revert fstack-protector check removal in @@ -384,7 +384,7 @@ index 047f121..f91a298 100644 2.30.0 -From 792a5611d1da8c0b03ee65d084910b9c58b6c873 Mon Sep 17 00:00:00 2001 +From e057edf6799a47a32550ee28777e7594b5a61785 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 19 Dec 2020 22:59:07 +1000 Subject: Extend getOSVersion for Haiku @@ -427,7 +427,7 @@ index 3b5e402..04042bd 100644 2.30.0 -From 96c4ece2d02774f20d7107ca9afc69a06aff16a2 Mon Sep 17 00:00:00 2001 +From 636716df4dcb03f876c3db2713c9296011416cbf Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 8 Feb 2021 15:50:11 +1000 Subject: Use dpi=100 for qt5 backend @@ -452,31 +452,7 @@ index 559ff4b..a44c973 100644 2.30.0 -From 707c57b3846198f2e4d942b5ee274e0209e44e44 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 8 Feb 2021 15:51:28 +1000 -Subject: Don't use fontconfig - - -diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx -index 50bae31..4d771ab 100644 ---- a/vcl/qt5/Qt5Graphics_Text.cxx -+++ b/vcl/qt5/Qt5Graphics_Text.cxx -@@ -85,6 +85,9 @@ bool Qt5Graphics::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) - void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC) - { - static const bool bUseFontconfig = (nullptr == getenv("SAL_VCL_QT5_NO_FONTCONFIG")); -+#ifdef __HAIKU__ -+ bUseFontconfig = false; -+#endif - - if (pPFC->Count()) - return; --- -2.30.0 - - -From 85a5a6ee70e7ff61caf0d2e02030d24a8fae17a3 Mon Sep 17 00:00:00 2001 +From 84c8851c38de8f9fd00897fb5dbefc2c4d6ddcee Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 8 Feb 2021 15:52:13 +1000 Subject: Disable hidpi for Haiku @@ -502,3 +478,30 @@ index ca1f914..1168da8 100644 -- 2.30.0 + +From 3c4d19a2a24d668ed21d4538b181d3f87ce5413c Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 8 Feb 2021 21:47:12 +1000 +Subject: Don't use fontconfig + + +diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx +index 50bae31..ba0aafb 100644 +--- a/vcl/qt5/Qt5Graphics_Text.cxx ++++ b/vcl/qt5/Qt5Graphics_Text.cxx +@@ -111,10 +111,10 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC) + const OString& rFileName = rMgr.getFontFileSysPath(aInfo.m_nID); + rFontManager.AddFontFile(rFileName, nFaceNum, nVariantNum, aInfo.m_nID, aDFA); + } +- ++#ifndef __HAIKU__ + if (bUseFontconfig) + SalGenericInstance::RegisterFontSubstitutors(pPFC); +- ++#endif + for (auto& family : aFDB.families()) + for (auto& style : aFDB.styles(family)) + pPFC->Add(Qt5FontFace::fromQFontDatabase(family, style)); +-- +2.30.0 +