diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-12-17 15:06:06 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-12-17 15:33:26 +0000 |
| commit | 76fa47020944a01a578f4ad0061976d7316d0a75 (patch) | |
| tree | 5e8270488bcd3dfa16bdb1016353bae0de5f81fc /libreoffice | |
| parent | 2e48d8eb32930db86cef537db329ecc43b4a4c5c (diff) | |
| download | contrib-76fa47020944a01a578f4ad0061976d7316d0a75.tar.gz contrib-76fa47020944a01a578f4ad0061976d7316d0a75.tar.xz | |
libreoffice: boost rebuild
Diffstat (limited to 'libreoffice')
| -rw-r--r-- | libreoffice/.signature | 5 | ||||
| -rw-r--r-- | libreoffice/Pkgfile | 4 | ||||
| -rw-r--r-- | libreoffice/boost.patch | 44 |
3 files changed, 50 insertions, 3 deletions
diff --git a/libreoffice/.signature b/libreoffice/.signature index be84bf8cd..bb1657e4d 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33VM3Vp4Om4EvNGZgdPghp3azpM4P5bFUDYlGO8CiKzI5UrC5s25zwYn45oK05arjwQjd3eMFnNwueTXg0UGsAI= -SHA256 (Pkgfile) = 5946e353f6fb4a3a4077055bf012df344182f620d9a4a77ee4f397751dd3c7cb +RWSagIOpLGJF30X9SD8553J1gNsJZViKaVBcI9phqDo1f5u0S5cugMLtoGDRsN+ei53soDSwODOuhlFBXab9IOmxT4OYn7TOSAY= +SHA256 (Pkgfile) = 6001ab80ba9b854d4d23c5fde29353ff1c8b27fc34a379599064dbaab7c4330e SHA256 (.footprint) = 7b3b507c326a1720a5a71b8b15c286fc1c67cc546e42aac790b71e3842441c98 SHA256 (libreoffice-7.4.3.2.tar.xz) = ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b SHA256 (libreoffice-dictionaries-7.4.3.2.tar.xz) = 3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389 @@ -8,4 +8,5 @@ SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 SHA256 (pdfium-5058.tar.bz2) = eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac +SHA256 (boost.patch) = de94a55ae3fbad001106b44a93b775f82e926814dd014d2e539d3a81655ed3bc SHA256 (makefile.in.patch) = 03f1b534fac16aadf273533836fae5c8e591200c95db48fe58aa0e2635a31c56 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index d3cfadcdd..60874417a 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -6,7 +6,7 @@ name=libreoffice version=7.4.3.2 -release=1 +release=2 pdfiumversion=5058 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-dictionaries-$version.tar.xz @@ -16,6 +16,7 @@ source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/ #https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 #https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz + boost.patch makefile.in.patch) # unpack_source() {{{ @@ -50,6 +51,7 @@ build() { cd $name-$version patch -Np1 -i $SRC/makefile.in.patch + patch -Np1 -i $SRC/boost.patch sed -i 's:application/pdf;::g' sysui/desktop/menus/draw.desktop sed -i 's:text/plain;::g' sysui/desktop/menus/writer.desktop sed -i 's:dragonbox-1.0.0:dragonbox:g' configure.ac diff --git a/libreoffice/boost.patch b/libreoffice/boost.patch new file mode 100644 index 000000000..cdbdd7383 --- /dev/null +++ b/libreoffice/boost.patch @@ -0,0 +1,44 @@ +From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + <congdanhqx@gmail.com> +Date: Sun, 27 Nov 2022 18:59:24 +0700 +Subject: i18n: fix build with Boost 1.81.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Boost.Locale since 1.81.0 switch to enum classes for facet type [1]. +Switch our resource manager accordingly. + +1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1 + +Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343 +Reviewed-by: Heiko Becker <heirecka@exherbo.org> +Tested-by: Caolán McNamara <caolanm@redhat.com> +Reviewed-by: Caolán McNamara <caolanm@redhat.com> +--- + unotools/source/i18n/resmgr.cxx | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx +index ddedf5b9e8a2..3a7116350062 100644 +--- a/unotools/source/i18n/resmgr.cxx ++++ b/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 +-- +cgit v1.2.1 + |