From fb120df753e9aa7d1d8db2477d7b729566f7445586c1d1fe819b45e496554956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 4 Dec 2018 09:38:10 +0000 Subject: [PATCH] Accepting request 653528 from home:adamm:branches:LibreOffice:Factory - boost_1_69.patch: Fix compilation with Boost 1.69 OBS-URL: https://build.opensuse.org/request/show/653528 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=731 --- boost_1_69.patch | 13 +++++++++++++ libreoffice.changes | 5 +++++ libreoffice.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 boost_1_69.patch diff --git a/boost_1_69.patch b/boost_1_69.patch new file mode 100644 index 0000000..ede9994 --- /dev/null +++ b/boost_1_69.patch @@ -0,0 +1,13 @@ +Index: libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx +=================================================================== +--- libreoffice-6.1.3.2.orig/sfx2/source/appl/shutdownicon.cxx ++++ libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx +@@ -141,7 +141,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 481e520..648e360 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -5,6 +5,11 @@ Thu Nov 29 10:41:59 UTC 2018 - jdelvare@suse.com overwrite an existing document * bsc1117300.patch +------------------------------------------------------------------- +Thu Nov 29 10:10:00 UTC 2018 - adam.majer@suse.de + +- boost_1_69.patch: Fix compilation with Boost 1.69 + ------------------------------------------------------------------- Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 2a54137..d9eb88b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -112,6 +112,7 @@ Patch8: bsc1112112.patch Patch9: bsc882383.patch # Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document Patch10: bsc1117300.patch +Patch11: boost_1_69.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -962,6 +963,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch990 -p1 # Disable some of the failing tests (some are random)