Accepting request 1062011 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/1062011
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=267

boost-181.patch

@@ -0,0 +1,41 @@
+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: [PATCH] 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 ddedf5b9e8a2f..3a71163500624 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

libreoffice.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 28 23:37:14 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- add boost-181.patch to fix build with boost 1.81.x
+
 -------------------------------------------------------------------
 Thu Jan 19 13:51:27 UTC 2023 - Andras Timar <andras.timar@collabora.com>
 

libreoffice.spec

@@ -105,6 +105,7 @@ Patch2:         nlpsolver-no-broken-help.diff
 Patch3:         mediawiki-no-broken-help.diff
 # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
 Patch6:         gcc11-fix-error.patch
+Patch7:         boost-181.patch
 Patch9:         fix_math_desktop_file.patch
 Patch10:        fix_gtk_popover_on_3.20.patch
 Patch11:        fix_webp_on_sle12_sp5.patch
@@ -1032,6 +1033,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch2
 %patch3
 %patch6 -p1
+%patch7 -p1
 %patch9 -p1
 %if 0%{?suse_version} < 1500
 %patch10 -p1