From 1940718c710cae75812c9f752983b3ef02b14c63532bfef8a63aeecfb2a4f76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Mar 2019 08:35:43 +0000 Subject: [PATCH] Accepting request 683590 from home:adamm:branches:LibreOffice:Factory - boost_169.patch: fix build with Boost 1.69 OBS-URL: https://build.opensuse.org/request/show/683590 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=765 --- boost_169.patch | 13 +++++++++++++ libreoffice.changes | 5 +++++ libreoffice.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 boost_169.patch diff --git a/boost_169.patch b/boost_169.patch new file mode 100644 index 0000000..8891f4d --- /dev/null +++ b/boost_169.patch @@ -0,0 +1,13 @@ +Index: libreoffice-6.2.1.2/sfx2/source/appl/shutdownicon.cxx +=================================================================== +--- libreoffice-6.2.1.2.orig/sfx2/source/appl/shutdownicon.cxx ++++ libreoffice-6.2.1.2/sfx2/source/appl/shutdownicon.cxx +@@ -143,7 +143,7 @@ bool LoadModule() + #endif // ENABLE_QUICKSTART_APPLET + } + assert(!boost::logic::indeterminate(loaded)); +- return loaded; ++ return (bool)loaded; + } + + } diff --git a/libreoffice.changes b/libreoffice.changes index 3c26fb1..2942192 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 10 15:51:32 UTC 2019 - Adam Majer + +- boost_169.patch: fix build with Boost 1.69 + ------------------------------------------------------------------- Fri Mar 8 09:23:06 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index b068c86..1ca7387 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -104,6 +104,7 @@ Patch5: old-boost.patch Patch6: kde5-32bit-build-fix.patch Patch7: libreoffice-postgresql.patch Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch +Patch9: boost_169.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -971,6 +972,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch6 -p1 %patch7 %patch8 -p1 +%patch9 -p1 %patch990 -p1 %patch991 -p1