diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:07:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:07:31 +0000 |
| commit | edaebb65d92a48d7075c8c1f64c5ffd87054827b (patch) | |
| tree | 045c941e1851cde1665bea22d97a2976b7a5bb69 /debian/patches/boost-1.81.diff | |
| parent | Adding upstream version 4:7.4.7. (diff) | |
| download | libreoffice-debian/4%7.4.7-1+deb12u1.tar.xz libreoffice-debian/4%7.4.7-1+deb12u1.zip | |
Adding debian version 4:7.4.7-1+deb12u1.debian/4%7.4.7-1+deb12u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/boost-1.81.diff')
| -rw-r--r-- | debian/patches/boost-1.81.diff | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/debian/patches/boost-1.81.diff b/debian/patches/boost-1.81.diff new file mode 100644 index 000000000..dcf99f6e9 --- /dev/null +++ b/debian/patches/boost-1.81.diff @@ -0,0 +1,48 @@ +From 7e61545966c61102aad56bbf10bae2edfbfa9226 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> +(cherry picked from commit 23dcd4339428e4080029ec5ae658e75f01e79a62) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144310 +Reviewed-by: Danh Doan <congdanhqx@gmail.com> +Tested-by: Jenkins +--- + 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 + |