From b45ed8830a9d12168d7c6bb3d18ada17fa4b5af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 24 Nov 2022 22:58:56 +0700 Subject: [PATCH] libreoffice: update to 7.4.3.2. --- srcpkgs/libreoffice/patches/boost-1.81.patch | 18 ++++++++++++++++++ srcpkgs/libreoffice/template | 14 ++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/libreoffice/patches/boost-1.81.patch diff --git a/srcpkgs/libreoffice/patches/boost-1.81.patch b/srcpkgs/libreoffice/patches/boost-1.81.patch new file mode 100644 index 00000000000..83b44b62c49 --- /dev/null +++ b/srcpkgs/libreoffice/patches/boost-1.81.patch @@ -0,0 +1,18 @@ +Index: libreoffice-7.4.2.3/unotools/source/i18n/resmgr.cxx +=================================================================== +--- libreoffice-7.4.2.3.orig/unotools/source/i18n/resmgr.cxx ++++ libreoffice-7.4.2.3/unotools/source/i18n/resmgr.cxx +@@ -127,8 +127,13 @@ namespace Translate + if (aFind != aCache.end()) + return aFind->second; + boost::locale::generator gen; ++#if BOOST_VERSION < 108100 + gen.characters(boost::locale::char_facet); + gen.categories(boost::locale::message_facet | boost::locale::information_facet); ++#else ++ gen.characters(boost::locale::char_facet_t::char_f); ++ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information); ++#endif + #if defined(ANDROID) + OString sPath(OString(lo_get_app_data_dir()) + "/program/resource"); + #else diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 7d1004672fa..313d32a47fa 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.4.2.3 -revision=2 +version=7.4.3.2 +revision=1 build_style=meta make_build_target="build" nocross="Several dependencies are nocross=yes" @@ -49,6 +49,8 @@ homepage="https://www.libreoffice.org/" # Source, dictionary, help and translations _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}" +# Please don't remove this mirror, it's faster for me +# _baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}" _addurl="https://dev-www.libreoffice.org/src" _exturl="https://dev-www.libreoffice.org/extern" @@ -107,10 +109,10 @@ distfiles=" ${_addurl}/Scheherazade-2.100.zip ${_addurl}/dragonbox-1.1.0.tar.gz " -checksum="82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a - 46a7fb02a6b06bbc8c6f0e8e6c286fbdb88404d68fad0635bdd008688ba93ed7 - 4f9ed5dd9d8b394be442ddb86f57cb78746282d886e0dc35add36e8b34170f5c - c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1 +checksum="ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b + 3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389 + d08f4a2f16fb375903270facab527e28de57deb9ba452f9d449d5271d0f118a2 + d034df36118844f9958dc775069b3b8b08d11cbb8b4b27531449bc6543bccd20 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66